Makoto Onuki
1d37d0f7fb
Add simple null checks to StorageWizard*, also listen to...
...
the disk destroyed event.
Bug 21336042
Change-Id: I9f53501a6122a4a9046774e3c4c08b5d6d6f8552
2015-06-12 16:28:18 -07:00
Selim Cinek
827c5419fa
am 0abc4fb6
: am ee5db351
: Merge "Added an introduction to the fingerprint enrollment" into mnc-dev
...
* commit '0abc4fb6e3c055e4107edd5a32466b4f4c90a7a8':
Added an introduction to the fingerprint enrollment
2015-06-12 22:22:27 +00:00
Selim Cinek
ee5db351ac
Merge "Added an introduction to the fingerprint enrollment" into mnc-dev
2015-06-12 21:57:45 +00:00
Makoto Onuki
0b5b05e2f5
am 20468a11
: am e0142a67
: Merge "Promote "add service" from menu to list item" into mnc-dev
...
* commit '20468a1160eef269b7116535128daeedfbb7811a':
Promote "add service" from menu to list item
2015-06-12 16:40:31 +00:00
Rubin Xu
7d4f7abc28
am 4c5eaae5
: am 47d329f7
: Merge "Defensively load untrusted icons from account authenticator" into mnc-dev
...
* commit '4c5eaae564f20e47e6c3a4f7906446b195c639da':
Defensively load untrusted icons from account authenticator
2015-06-12 16:40:29 +00:00
Makoto Onuki
e0142a67fd
Merge "Promote "add service" from menu to list item" into mnc-dev
2015-06-12 16:18:31 +00:00
Rubin Xu
47d329f79a
Merge "Defensively load untrusted icons from account authenticator" into mnc-dev
2015-06-12 16:18:16 +00:00
Selim Cinek
ec8500438c
Added an introduction to the fingerprint enrollment
...
Bug: 21468315
Change-Id: Ieb691b0e321f44b9bae2f4f8dfd458c24b98a8d9
2015-06-11 19:02:26 -07:00
Adrian Roos
b52435a963
am 593c1845
: am da6e4c47
: Merge "Ensure text is visible when choosing pattern" into mnc-dev
...
* commit '593c184584944aed230889a0e736ac484c435683':
Ensure text is visible when choosing pattern
2015-06-12 00:52:07 +00:00
Adrian Roos
da6e4c47aa
Merge "Ensure text is visible when choosing pattern" into mnc-dev
2015-06-12 00:26:07 +00:00
Adrian Roos
ed427af748
Ensure text is visible when choosing pattern
...
Bug: 21639578
Change-Id: Ib948411b3087c752a36ed6f853915e59946c0988
2015-06-11 16:14:40 -07:00
Jorim Jaggi
e750927c70
am 258e709a
: am fb535a8e
: Merge "Refine fingerprint enrollment experience" into mnc-dev
...
* commit '258e709a32ce69c906bea9e13e999d52e8ff5b32':
Refine fingerprint enrollment experience
Fix crash in battery screen
2015-06-11 23:05:50 +00:00
Amit Mahajan
9d4b548619
Change to trigger client initiated OMA-DM session on System update req.
...
Bug: 21603815
Change-Id: I401099a9aeced578ee914ddbebf1f5982f276780
2015-06-11 15:54:31 -07:00
Jorim Jaggi
fb535a8e49
Merge "Refine fingerprint enrollment experience" into mnc-dev
2015-06-11 22:34:53 +00:00
Jeff Sharkey
a48e4fd9ed
am 41b7468f
: am f25fc9cb
: Merge "Always round migration times up to 1 second." into mnc-dev
...
* commit '41b7468feb96ac51f494abc5414f7f02e801ed97':
Always round migration times up to 1 second.
2015-06-11 22:17:19 +00:00
Jorim Jaggi
436e02c3d5
Refine fingerprint enrollment experience
...
- Flash fingerprint graphic when enrollment progresses
- Show hint message when not progressing for a few seconds
- Make sure animation is always working
Bug: 21617091
Bug: 21644138
Change-Id: Ic54c10a655e6da914f960cee20f0066b46d87325
2015-06-11 15:13:56 -07:00
Makoto Onuki
0ec96fe64c
Promote "add service" from menu to list item
...
Also show the app icon for each service.
Bug 19914125
Change-Id: I592c526746a3ec9f67e8e8a6c6f1530e7724e310
2015-06-11 14:26:29 -07:00
Jason Monk
1c4dcb0315
am 02424dea
: am 0011604f
: Merge "Clean up settings shortcuts" into mnc-dev
...
* commit '02424dead1be6877d11bf30ba87e2b97dc9042d1':
Clean up settings shortcuts
2015-06-11 21:11:02 +00:00
Jeff Sharkey
f25fc9cb67
Merge "Always round migration times up to 1 second." into mnc-dev
2015-06-11 20:45:09 +00:00
Jeff Sharkey
5693274d2a
Always round migration times up to 1 second.
...
Bug: 21755250
Change-Id: I4e5eef493f2f923d0bcf110133e862c4a4a7db8b
2015-06-11 13:43:56 -07:00
Jason Monk
0011604fd1
Merge "Clean up settings shortcuts" into mnc-dev
2015-06-11 19:56:50 +00:00
Jason Monk
2acff556c2
Clean up settings shortcuts
...
- Remove some bad entries
- Fix icons to be top-level item specific
- Add memory
Bug: 20632230
Change-Id: I067b467b9ee354b52ef61b312dc5a89fd7eae2ac
2015-06-11 15:47:29 -04:00
John Spurlock
6b2adf6e4e
am eed22852
: am fca81cd2
: Merge "Settings: Follow frameworks change to volume sliders." into mnc-dev
...
* commit 'eed2285257b9ae6b09d3dc36425578634f9fed27':
Settings: Follow frameworks change to volume sliders.
2015-06-11 14:30:42 +00:00
Paul Jensen
6953eea28b
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
...
Change-Id: Ifa44c7553c7c45ebe261a2a124d9bf8d6f96c690
2015-06-11 10:26:33 -04:00
John Spurlock
fca81cd233
Merge "Settings: Follow frameworks change to volume sliders." into mnc-dev
2015-06-11 14:08:46 +00:00
John Spurlock
f82154de8c
Settings: Follow frameworks change to volume sliders.
...
Bug: 21267436
Change-Id: I72c6411346429ebf428662d1c6d6d8a7529c0d67
2015-06-11 10:06:30 -04:00
Sanket Padawe
baf0db3d2b
am 00c5226d
: am 1d220f62
: Merge "Fix SimPreference dialog from closing on orientation change." into mnc-dev
...
* commit '00c5226d6f7aad21e85c06808961eb97e01e982d':
Fix SimPreference dialog from closing on orientation change.
2015-06-11 02:54:24 +00:00
Jeff Sharkey
bfd717b150
am 3b47da58
: am 680329f1
: Follow string refactoring.
...
* commit '3b47da581b2c05f00a2d9f5d3cd0f10fb786c7e6':
Follow string refactoring.
2015-06-11 02:53:17 +00:00
Lajos Molnar
204f4068f7
am f7192038
: am 63504d83
: Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev
...
* commit 'f7192038dc7973c2492dc4eadcad6f5e03207ff4':
developer settings: remove "Use deprecated AwesomePlayer" settings
2015-06-11 02:53:15 +00:00
Jorim Jaggi
6dd8e039da
am a66b907b
: am ed76e59e
: Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev
...
* commit 'a66b907b1610ad67fd8c9b5746fa579bf886825c':
Animations/success state for external confirm device credentials (2/2)
2015-06-11 02:53:13 +00:00
Lucky Zhang
234c4c6c7c
am ab21c7fa
: am 34450932
: Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev
...
* commit 'ab21c7fa458e8aeabeef22096e304fd0c9a484da':
[Settings] Pass lock type extra back to SUW
2015-06-11 02:53:12 +00:00
Sanket Padawe
1d220f6242
Merge "Fix SimPreference dialog from closing on orientation change." into mnc-dev
2015-06-11 01:41:21 +00:00
Sanket Padawe
f6f43e4c45
Fix SimPreference dialog from closing on orientation change.
...
Bug: 19041463
Change-Id: I8c91fd6f01bbeb7561365dbb76ba3d4c05b76efc
2015-06-10 17:46:31 -07:00
Jeff Sharkey
680329f10c
Follow string refactoring.
...
Change-Id: Ib450724a20283a3bf356593e487b8ee6e9c8de5c
2015-06-10 17:27:44 -07:00
Lajos Molnar
63504d8326
Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev
2015-06-10 23:23:49 +00:00
Nick Kralevich
54d37cddc6
am d9bd6a65
: am 8da8e528
: Merge "Fix USB access control when adb is disabled." into mnc-dev
...
* commit 'd9bd6a65769633548ffd3f281743c112a946a84d':
Fix USB access control when adb is disabled.
2015-06-10 23:16:38 +00:00
Jason Monk
3b145d9086
am c5884544
: am a576d55a
: Merge "Hide tap to wake on devices that don\'t support it" into mnc-dev
...
* commit 'c58845442a94bd7d4945cb1d28aec673b29c338b':
Hide tap to wake on devices that don't support it
2015-06-10 23:15:36 +00:00
Jason Monk
24da852968
am ac6bb3c2
: am dc748cb3
: Merge "App storage settings - Request size onResume" into mnc-dev
...
* commit 'ac6bb3c23b6d2e0b4bd6003a3c6fbda8f6ba0a0c':
App storage settings - Request size onResume
2015-06-10 23:15:30 +00:00
Jason Monk
68ce17ff25
am 3de2cf4b
: am d09be7ed
: Merge "New dialog for ignore battery optimizations" into mnc-dev
...
* commit '3de2cf4b2f0cae4b6a86f612f71620dda6495c0c':
New dialog for ignore battery optimizations
2015-06-10 23:15:28 +00:00
Jorim Jaggi
ed76e59e49
Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev
2015-06-10 23:10:08 +00:00
Lucky Zhang
34450932b2
Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev
2015-06-10 23:01:26 +00:00
Jorim Jaggi
ff41a9a5a6
Animations/success state for external confirm device credentials (2/2)
...
Bug: 20929186
Change-Id: I4489dd37f1148fb03315ec337a546eee04660cb5
2015-06-10 15:17:24 -07:00
Lajos Molnar
ee55eac297
developer settings: remove "Use deprecated AwesomePlayer" settings
...
Bug: 17108024
Change-Id: I602eba3214cacef7435ce6347e885c040d5c443c
2015-06-10 15:00:13 -07:00
Nick Kralevich
8da8e52874
Merge "Fix USB access control when adb is disabled." into mnc-dev
2015-06-10 21:11:35 +00:00
Jason Monk
a576d55a0e
Merge "Hide tap to wake on devices that don't support it" into mnc-dev
2015-06-10 20:26:12 +00:00
Jason Monk
181e0e9ec0
Hide tap to wake on devices that don't support it
...
Bug: 21650579
Change-Id: I3fbcccc80b5773c74d8398f1d23b4762a5bf54ed
2015-06-10 16:16:10 -04:00
Jason Monk
dc748cb38a
Merge "App storage settings - Request size onResume" into mnc-dev
2015-06-10 20:12:07 +00:00
Jason Monk
ece9d5145f
App storage settings - Request size onResume
...
Our data might be stale (especially when coming from manage space
activities).
Bug: 21680510
Change-Id: Ifb919e05f23f76677b6de2aff3d13d00e195facb
2015-06-10 16:08:01 -04:00
Jason Monk
d09be7ed30
Merge "New dialog for ignore battery optimizations" into mnc-dev
2015-06-10 20:06:12 +00:00
Jason Monk
3a90d7cc69
New dialog for ignore battery optimizations
...
Bug: 21375688
Change-Id: I7240cc0615044cf5a34349e5ffdf2ae2e0f6333f
2015-06-10 15:49:36 -04:00