| e20deea7112a17ac4799f6924cddc27b4678f791 |
|
31-Mar-2016 |
Udam Saini <udam@google.com> |
Merge "Prevents users from being added if device is not provisioned" into nyc-dev
|
| 0708d9e119da4c4d9424c0bc54fa458d01856bd7 |
|
29-Mar-2016 |
Udam Saini <udam@google.com> |
Fixes back button on action bar on some fragments.
SettingsPreferenceFragment has this already set so that the drawer
layout will work when the menu doesn't exist. However, some fragments
are not preference fragments, and we need to set setHasOptionsMenu
manually.
bug:27879503
Change-Id: I6faadeb56dab00af611ac413109800822038c66d
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| 679f7ad07e4e2a4b4c6645d05bca92790394c2fd |
|
25-Mar-2016 |
Udam Saini <udam@google.com> |
Prevents users from being added if device is not provisioned
Also added a utility function for checking provisioning, instead of
repeating code for this check in several places.
bug:26156445
Change-Id: I9f4a280dd0cdf889f892e386dbf6a3fdb2a052ef
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| 7dbbe131683c231f6820bca4d67853649a4836f8 |
|
16-Feb-2016 |
Sudheer Shanka <sudheersai@google.com> |
Add disabled by policy empty views to more screens.
Bug: 27214401
Change-Id: I6cd4292a63610671070bf2134105e9e348c3ab32
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| 9d1bfd1e8de6e46137a9571507c03526880d6a46 |
|
27-Jan-2016 |
Chris Wren <cwren@android.com> |
port settings over to new metrics enum
Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| ff8a68010e2f7f41da6db592f3eea836e7d9274f |
|
18-Nov-2015 |
Russell Brenner <russellbrenner@google.com> |
resolve merge conflicts of 7285e2c2fc to master.
Change-Id: I56ebcc0dac917791b19ee308eed30bb51267a817
|
| de4fc8eb2a27797adaa7afac98fa3a2a7ffd8f99 |
|
06-Nov-2015 |
Russell Brenner <russellbrenner@google.com> |
Preserve FRP lock if wiped during SUW
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.
[resolves merge conflicts with ag/808069]
Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| 39b467482d1bf256a111c757e9b7621c6f523271 |
|
10-Sep-2015 |
Jason Monk <jmonk@google.com> |
Depend on support lib preferences
Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| 8a38801bcf2eed131d11b1fec297c2c5217d0436 |
|
19-Aug-2015 |
Julia Reynolds <juliacr@google.com> |
Fix settings crash during factory reset.
If you close and then launch settings before the persistent
data block wipe is finished.
Bug: 20458454
Change-Id: I07bf79f25bcb30ac8932925aa7b77b9a95d16e20
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| ce25af48383b26535ec07312ab0db6928bba1fe3 |
|
08-Jul-2015 |
Julia Reynolds <juliacr@google.com> |
Talkback improvements for Settings screens.
Bug: 21164141
Change-Id: I7444261ccf967f6db70c9fe44a00bd3f19ceb975
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| ccbdc57ee768f291d062f3578953f5a53e37eaee |
|
26-Jun-2015 |
Rubin Xu <rubinxu@google.com> |
No longer use ExternalStorageFormatter to format external storage
Bug: 9433509
Change-Id: I5723828de080df568937004157acf830ca190f81
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| c17ec1be19a45dec12d601f1e6a545f558bdf293 |
|
02-Jun-2015 |
Andres Morales <anmorales@google.com> |
[MasterClear] fix race in showing dialog
Wiping the PDB effectively starves all other threads from
accessing flash, and freezes the UI. We throw up a dialog
but there's a race between drawing the dialog and starting the
wipe.
Show the dialog in onPreExecute to fix this.
Bug: 20854355
Change-Id: I8462f5ed3ff53ed574ebc1be416a821c2086b4f5
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| 8a963babe2e36b7a41f77b8d2598c97658196e58 |
|
20-Mar-2015 |
Chris Wren <cwren@android.com> |
log visibility of views
Depends-On: I5b1dccb5d103ece3112acf38889bae16273b092f
Change-Id: I116aed2bb805f723a5bf2ec9eb94257de0b4a7b5
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| 1de688d911cf96eff39eddc5a7070e3c44efefc1 |
|
24-Sep-2014 |
Jeff Sharkey <jsharkey@android.com> |
Include reason when wiping data.
This will help us track down who requested a data wipe.
Bug: 17412160
Change-Id: I46b3f12a661a406450d23a7974513f40beb23c8d
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| e6bf2a5609b9aabbd790c3c3680172f4b50a3f8e |
|
08-Sep-2014 |
Andres Morales <anmorales@google.com> |
Fix issue where can't FR Volantis if OEM unlock is enabled
Bug: 17426800
Change-Id: I02340d1ec4b80d9e3b05d35d36653c6ff4ff3232
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| ab61b0df4af1a504e845c7008224ebadb5400ce9 |
|
26-Aug-2014 |
Andres Morales <anmorales@google.com> |
Throw up ProgressDialog when erasing PST partition
This needs to be done here, but we should let the user know
we're doing work.
Bug: 17185720
Change-Id: I0d71ae38145e0649a430a8231b7e3f250c003ee8
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| ae58323a6b172f4a8607e6b187ea5c45b9b8e185 |
|
07-Aug-2014 |
Andres Morales <anmorales@google.com> |
Don't wipe PST partition if OEM unlock is enabled
This will be wiped by the recovery system and the OEM
unlock bit will be retained.
Bug: 16631974
Change-Id: I65522dd93c8465ff7f7ecbcef404bff6e9c864d6
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| 7ab8929cc6ecbd1ba14c0d6ecb393b31f9a6fcda |
|
11-Jul-2014 |
Andres Morales <anmorales@google.com> |
On factory reset, wipe the stored account challenges
Each time a user adds an account, a challenge gets
stored to the persistent data block service.
If a user factory resets *from Settings*, this is
considered a "secure wipe" and thus we must wipe
the account challenges as well.
No other factory reset mechanism must be permitted
to wipe this data.
Bug: 14288780
Change-Id: Ibe48ccae2d7b5f8d736717a27b7c4f44bed0fba7
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| 2c53933e8d35ba50d0791a29e46fa3156e9cab7c |
|
11-Jun-2014 |
Julia Reynolds <juliacr@google.com> |
Use user restriction instead of pin to guard factory reset in Settings.
Bug: 14081992
Change-Id: I60f132312368c5097b46ab97e881eec3700ef586
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|
| b14e1e04939ca610fd5f2439f879265450b0a6cd |
|
02-Nov-2010 |
Amith Yamasani <yamasani@google.com> |
Fragmentize "Factory reset" setting screen.
Split the screen into 2 fragments.
Bug: 3148480
/packages/apps/Settings/src/com/android/settings/MasterClearConfirm.java
|