Jason Monk
1c8a483cb6
am a82961f1
: am f8577c68
: Merge "Support disabled until used apps" into mnc-dev
...
* commit 'a82961f108e18eaefb836f83fe1508c706a563b1':
Support disabled until used apps
2015-06-17 20:53:32 +00:00
Jason Monk
f5269f3bde
am c3570166
: am 2ab42701
: Merge "Fix accessibility for empty list on notification access" into mnc-dev
...
* commit 'c3570166c2484f76e73e76eecdf8cd2870d1a0ac':
Fix accessibility for empty list on notification access
2015-06-17 20:53:31 +00:00
Jason Monk
a82961f108
am f8577c68
: Merge "Support disabled until used apps" into mnc-dev
...
* commit 'f8577c68afbf4965211ca99233f7c5e40560e566':
Support disabled until used apps
2015-06-17 20:41:36 +00:00
Jason Monk
c3570166c2
am 2ab42701
: Merge "Fix accessibility for empty list on notification access" into mnc-dev
...
* commit '2ab427010ae16af8756347cefac6350ce83041e8':
Fix accessibility for empty list on notification access
2015-06-17 20:41:34 +00:00
Jason Monk
f8577c68af
Merge "Support disabled until used apps" into mnc-dev
2015-06-17 20:31:27 +00:00
Jason Monk
2ab427010a
Merge "Fix accessibility for empty list on notification access" into mnc-dev
2015-06-17 20:31:17 +00:00
Jason Monk
6baf98eb46
Fix accessibility for empty list on notification access
...
Bug: 21797352
Change-Id: I6c68c9abb43c6dfcc8b0a4d07cfe0d4cede6e817
2015-06-17 15:42:45 -04:00
Makoto Onuki
1cc4bd3326
am a42d94d8
: am 9f2b5a74
: Merge "Don\'t crash on NameNotFoundException" into mnc-dev
...
* commit 'a42d94d82e72c5ef0e99cb9f755673c82e3f8955':
Don't crash on NameNotFoundException
2015-06-17 18:15:09 +00:00
Makoto Onuki
a42d94d82e
am 9f2b5a74
: Merge "Don\'t crash on NameNotFoundException" into mnc-dev
...
* commit '9f2b5a74420988824dd3a91abcdb85bea6fc48fa':
Don't crash on NameNotFoundException
2015-06-17 17:57:56 +00:00
Makoto Onuki
9f2b5a7442
Merge "Don't crash on NameNotFoundException" into mnc-dev
2015-06-17 17:46:50 +00:00
Makoto Onuki
302b77f425
Don't crash on NameNotFoundException
...
Just finish().
Bug 20672468
Change-Id: Ic600e060990b7e3bc3e98bda63d0f4c9e530fb94
2015-06-17 10:22:28 -07:00
Geoff Mendal
6a28e2573a
am 7343ecc7
: (-s ours) am 2eb7ad26
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '7343ecc71fff3aae7ca1721a958d18850b7dc04e':
Import translations. DO NOT MERGE
2015-06-17 15:44:51 +00:00
Geoff Mendal
7343ecc71f
am 2eb7ad26
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '2eb7ad2648e85f2474d271499ec43241264ca148':
Import translations. DO NOT MERGE
2015-06-17 15:32:25 +00:00
Geoff Mendal
2eb7ad2648
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-06-17 15:23:34 +00:00
Geoff Mendal
38f0b79f33
Import translations. DO NOT MERGE
...
Change-Id: I1ec85dbe877d7fae6edf1f93ec812bc7b1223daa
Auto-generated-cl: translation import
2015-06-17 07:59:14 -07:00
Jason Monk
f424ccf743
am 5c2de952
: am 7fdb1478
: RIP -night DO NOT MERGE
...
* commit '5c2de952e5e7f2501df7a5a94794e526902e47a3':
RIP -night DO NOT MERGE
2015-06-17 13:47:00 +00:00
Jason Monk
5c2de952e5
am 7fdb1478
: RIP -night DO NOT MERGE
...
* commit '7fdb1478728ed7eaab956da476540b3e9c97b9b3':
RIP -night DO NOT MERGE
2015-06-17 13:37:31 +00:00
Jason Monk
840164a21c
am 2abd5be3
: am 7a5cb3b9
: Merge "Guard against callbacks when no list view created" into mnc-dev
...
* commit '2abd5be388fe29e0a70a4e69f95d6dcc56004a58':
Guard against callbacks when no list view created
2015-06-17 13:23:09 +00:00
Jason Monk
7fdb147872
RIP -night DO NOT MERGE
...
Bug: 21854466
Change-Id: Ied1512cb1d8c80df9f6c990f8f91f82d7f140533
2015-06-17 09:17:31 -04:00
Jason Monk
2abd5be388
am 7a5cb3b9
: Merge "Guard against callbacks when no list view created" into mnc-dev
...
* commit '7a5cb3b9c34af2215bdaaddba976f04bbafd06eb':
Guard against callbacks when no list view created
2015-06-17 13:09:18 +00:00
Jason Monk
7a5cb3b9c3
Merge "Guard against callbacks when no list view created" into mnc-dev
2015-06-17 13:01:28 +00:00
Jeff Sharkey
a39077c95b
am 67832cc3
: am 74c7f1fc
: Merge "Actually gracefully finish this time around." into mnc-dev
...
* commit '67832cc3984665cf55ac3d4afc5fdbb76326f1a0':
Actually gracefully finish this time around.
2015-06-17 03:45:06 +00:00
Jeff Sharkey
67832cc398
am 74c7f1fc
: Merge "Actually gracefully finish this time around." into mnc-dev
...
* commit '74c7f1fcd3451bdb5b49f2b44b86fd4ec8eb6794':
Actually gracefully finish this time around.
2015-06-17 03:31:44 +00:00
Jeff Sharkey
74c7f1fcd3
Merge "Actually gracefully finish this time around." into mnc-dev
2015-06-17 03:23:59 +00:00
Jeff Sharkey
665094c9d2
Actually gracefully finish this time around.
...
Also fix tinting on front-door icon.
Bug: 21403958
Change-Id: I74f0372a41b92235abe10391f36d9f6a1e6a40c5
2015-06-16 20:21:12 -07:00
Jim Miller
8b5943c2fb
am dd0d9854
: am 4b60af78
: Merge "Fix issue with german translation of lock times" into mnc-dev
...
* commit 'dd0d9854a5e4e946e8cb55a91148f17e4424836f':
Fix issue with german translation of lock times
2015-06-17 00:20:35 +00:00
Jim Miller
dd0d9854a5
am 4b60af78
: Merge "Fix issue with german translation of lock times" into mnc-dev
...
* commit '4b60af78fa8b0c474c9aee0f03171867843d2838':
Fix issue with german translation of lock times
2015-06-17 00:09:52 +00:00
Jeff Sharkey
122b4d735f
am 2ef947be
: am 4e42cbdb
: Merge "Gracefully finish when missing volume." into mnc-dev
...
* commit '2ef947be79e6ecf5d5e8acfb054247a8902d7993':
Gracefully finish when missing volume.
2015-06-17 00:09:43 +00:00
Jim Miller
4b60af78fa
Merge "Fix issue with german translation of lock times" into mnc-dev
2015-06-16 23:59:43 +00:00
Jeff Sharkey
2ef947be79
am 4e42cbdb
: Merge "Gracefully finish when missing volume." into mnc-dev
...
* commit '4e42cbdba386a742b01871010ec8747e07471e29':
Gracefully finish when missing volume.
2015-06-16 23:56:37 +00:00
Jeff Sharkey
4e42cbdba3
Merge "Gracefully finish when missing volume." into mnc-dev
2015-06-16 23:48:07 +00:00
Jeff Sharkey
e79ff145f3
Gracefully finish when missing volume.
...
Bug: 21403958
Change-Id: Icb78bb633842571c4df696c9db72a5b97ece0655
2015-06-16 16:46:03 -07:00
Jim Miller
50d7d19a73
Fix issue with german translation of lock times
...
The word "immediately" would go into a different place in the sentence
than a number so we have to break this into two strings.
Fixes bug 21602326
Change-Id: Ie07f1bc84d68bdea8d6f1264dfd18326c2e48df4
2015-06-16 16:21:27 -07:00
Brian Carlstrom
99c1009a89
am 49d73c03
: am 94f4cb4e
: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
...
* commit '49d73c03aa5b8b21c5e8a926b6a894245ffdf906':
dex2oat should show something friendlier in Settings -> Battery
2015-06-16 23:18:33 +00:00
Brian Carlstrom
49d73c03aa
am 94f4cb4e
: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
...
* commit '94f4cb4e4660db823d268d14eb1199dbc11f8e86':
dex2oat should show something friendlier in Settings -> Battery
2015-06-16 23:07:52 +00:00
Brian Carlstrom
94f4cb4e46
Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
2015-06-16 22:59:04 +00:00
Jeff Sharkey
aa1e5f2f00
am 5fafa130
: am 95b891af
: Merge "Finish storage wizard theming." into mnc-dev
...
* commit '5fafa130ec8f031310e5372a89034057053fa634':
Finish storage wizard theming.
2015-06-16 22:49:20 +00:00
Makoto Onuki
3f507b2fbd
am abf80cb1
: am d91ddfeb
: Merge "Allow formatting when a partition is corrupt." into mnc-dev
...
* commit 'abf80cb1d058aa96abd29a329a6f79b6e62acad9':
Allow formatting when a partition is corrupt.
2015-06-16 22:49:19 +00:00
Jeff Sharkey
5fafa130ec
am 95b891af
: Merge "Finish storage wizard theming." into mnc-dev
...
* commit '95b891af7c77d51f6284e01467bd6323d3749068':
Finish storage wizard theming.
2015-06-16 22:36:06 +00:00
Makoto Onuki
abf80cb1d0
am d91ddfeb
: Merge "Allow formatting when a partition is corrupt." into mnc-dev
...
* commit 'd91ddfeb16f3019807e2d0146f774975acef36bd':
Allow formatting when a partition is corrupt.
2015-06-16 22:36:05 +00:00
Jeff Sharkey
95b891af7c
Merge "Finish storage wizard theming." into mnc-dev
2015-06-16 22:31:29 +00:00
Jeff Sharkey
8e987d9bfb
Finish storage wizard theming.
...
Storage wizard screens now have updated assets from UX, and various
assets are tinted consistently. We're using our own navigation bar
and wholesale replacing the layout from upstream.
Fix text colors in night mode. Tell SystemUI when we're finished
with the wizard flow.
Bug: 21830731
Change-Id: Ic8d09cc152bfb4dcc6089b5c61d28cbdd4be3ee9
2015-06-16 15:28:49 -07:00
Makoto Onuki
d91ddfeb16
Merge "Allow formatting when a partition is corrupt." into mnc-dev
2015-06-16 22:27:09 +00:00
Jason Monk
24db3674af
am 283c469d
: am e9ec307a
: Merge "Remove theme setting DO NOT MERGE" into mnc-dev
...
* commit '283c469dc82841827d3dd2e7052f68c5e71f1425':
Remove theme setting DO NOT MERGE
2015-06-16 21:26:03 +00:00
Jason Monk
23d6ab342a
am fbebf8cf
: am 254e8aea
: Merge "Update for shortcuts" into mnc-dev
...
* commit 'fbebf8cfc4a612b6708d024ce71e8069e87cd310':
Update for shortcuts
2015-06-16 21:25:48 +00:00
Yorke Lee
c47e89a44c
am 0d736b59
: am 610413d3
: Merge "Send broadcast when default dialer changes" into mnc-dev
...
* commit '0d736b59d88ffd7dd5ea7c823669d69dcf14737e':
Send broadcast when default dialer changes
2015-06-16 21:23:13 +00:00
Jason Monk
9afed46106
am 20d32181
: am d0eab40a
: Merge "Don\'t show work apps in ignore optimizations list" into mnc-dev
...
* commit '20d3218182fa24dfba48adab8002af383cfe2ae7':
Don't show work apps in ignore optimizations list
2015-06-16 21:23:12 +00:00
Jason Monk
18c5d20bd3
am 0af2586a
: am 455cea62
: Merge "Add warning for disabling usage access on prof owners" into mnc-dev
...
* commit '0af2586ad75e64f3c8bc12dccbad2d64ef208159':
Add warning for disabling usage access on prof owners
2015-06-16 21:23:10 +00:00
Sanket Padawe
3c2f469bf9
am fc4e9cbd
: am 7171d686
: Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
...
* commit 'fc4e9cbdf928b6b8bcbdd96a9940e0333a49193e':
Add PBAP checkbox for BT pairing consent dialog.
2015-06-16 21:23:09 +00:00
Jason Monk
464ad14d37
am 808f7826
: am 6e613472
: Start all help intents as startActivityForResult
...
* commit '808f7826b1259c6f0344d5273b7855c93cfe44f7':
Start all help intents as startActivityForResult
2015-06-16 21:23:08 +00:00