OSDN Git Service
Jason Monk [Thu, 9 Jul 2015 19:08:33 +0000 (19:08 +0000)]
am
5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev
* commit '
5c3b7c3adefe27bf0a91eba8318048b677d276eb':
Don't clear data summary when loader is cancelled
Jason Monk [Thu, 9 Jul 2015 19:08:31 +0000 (19:08 +0000)]
am
b6b85325: Merge "Fix rotation issues" into mnc-dev
* commit '
b6b85325e91a3e22dd23d67241adecc359dc0952':
Fix rotation issues
Jason Monk [Thu, 9 Jul 2015 18:55:07 +0000 (18:55 +0000)]
Merge "Don't clear data summary when loader is cancelled" into mnc-dev
Jason Monk [Thu, 9 Jul 2015 18:55:03 +0000 (18:55 +0000)]
Merge "Fix rotation issues" into mnc-dev
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 17:48:59 +0000 (17:48 +0000)]
am
ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev
* commit '
ee77eced69fac3e6f94cbb3ce2013d8334c17c90':
Check signature match between Cert installer and Settings
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 17:33:22 +0000 (17:33 +0000)]
Merge "Check signature match between Cert installer and Settings" into mnc-dev
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 16:30:20 +0000 (17:30 +0100)]
Check signature match between Cert installer and Settings
To prevent an app masquerading as com.android.certinstaller install
malicious certs.
Bug:
22095968
Change-Id: Ia79f326af0f39a23b687cb08981920665669e0a1
Jason Monk [Thu, 9 Jul 2015 15:22:26 +0000 (11:22 -0400)]
Don't clear data summary when loader is cancelled
Keep whatever summary we had before.
Bug:
22351861
Change-Id: Id2088404f09dcadce1cbf2959918956844d613a7
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 15:14:59 +0000 (15:14 +0000)]
am
4bbe3d1f: Update all shown preferences in Settings > Storage
* commit '
4bbe3d1fb66a99bfdf4cad8f2e77df23dccebbbd':
Update all shown preferences in Settings > Storage
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 14:37:26 +0000 (15:37 +0100)]
Update all shown preferences in Settings > Storage
This is achieved by iterating through the pool of StorageItemPreferences up
to the index of the last shown one, instead of iterating through the
preferences of the screen which may miss preferences inside other top-level
preference groups.
Bug:
22353561
Change-Id: I2293a7949a5becfb506d6b7965f8db2f11845756
Jason Monk [Thu, 9 Jul 2015 14:33:58 +0000 (10:33 -0400)]
Fix rotation issues
Bug:
22373905
Bug:
22311581
Change-Id: Idbed99a3fc0cc64047da151be166ee0ea4c1fb3d
Sasha Levitskiy [Wed, 8 Jul 2015 23:38:42 +0000 (23:38 +0000)]
am
93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev
* commit '
93b1a5a974f723f5aa463162b1f5aa43338f8c2e':
Fingerprint: Add post enroll call
Tim Kilbourn [Wed, 8 Jul 2015 23:38:40 +0000 (23:38 +0000)]
am
49983b99: Show correct text for app link domains.
* commit '
49983b991c01af0bc958eee1ddad144b7bde44ec':
Show correct text for app link domains.
Sasha Levitskiy [Wed, 8 Jul 2015 23:34:26 +0000 (23:34 +0000)]
Merge "Fingerprint: Add post enroll call" into mnc-dev
Sasha Levitskiy [Wed, 8 Jul 2015 22:36:44 +0000 (15:36 -0700)]
Fingerprint: Add post enroll call
Bug
22007124
Change-Id: I670e101a1b7dfa77a4e45022840dfc916fe5ee0d
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Tim Kilbourn [Thu, 11 Jun 2015 23:43:59 +0000 (16:43 -0700)]
Show correct text for app link domains.
The user's preferences were not queried on the app listing, making it
look like an app would open links even after the user disabled app
links for the app.
Bug:
21093152
Change-Id: I133ff229bb5e289ebec8df06924936fb3177f095
Jorim Jaggi [Wed, 8 Jul 2015 22:08:06 +0000 (22:08 +0000)]
am
b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev
* commit '
b493b2910190b95bba6cad0f328a0339acebef9b':
Hide screenshot preference when assist is disabled
Jeff Sharkey [Wed, 8 Jul 2015 22:08:05 +0000 (22:08 +0000)]
am
80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
* commit '
80eba76b109efa7e48eaf7aac145e05938d4405e':
Move storage when formatting primary disk.
Jorim Jaggi [Wed, 8 Jul 2015 21:59:00 +0000 (21:59 +0000)]
Merge "Hide screenshot preference when assist is disabled" into mnc-dev
Jeff Sharkey [Wed, 8 Jul 2015 21:55:17 +0000 (21:55 +0000)]
Merge "Move storage when formatting primary disk." into mnc-dev
Amit Mahajan [Wed, 8 Jul 2015 20:37:01 +0000 (20:37 +0000)]
am
01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '
01ce80b574e2404d911750c16a1ddd89c787f3ff':
Remove 'do not translate' comment for string 'None'.
Sanket Padawe [Wed, 8 Jul 2015 20:37:00 +0000 (20:37 +0000)]
am
c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit '
c7777b947097160cd89252f1f1e27704d82c25f6':
Locale based string changes in BT.
Sanket Padawe [Wed, 8 Jul 2015 20:36:58 +0000 (20:36 +0000)]
am
c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit '
c9cdf9c814020c777ffec7cfceb5b38c74e091f5':
Disable CA certificate for EAP-SIM, AKA & AKA'
Jorim Jaggi [Wed, 8 Jul 2015 20:32:12 +0000 (13:32 -0700)]
Hide screenshot preference when assist is disabled
Bug:
22343636
Change-Id: Ic455232dda209f7fadec41aee85903623a4e6bda
Amit Mahajan [Wed, 8 Jul 2015 20:23:45 +0000 (20:23 +0000)]
Merge "Remove 'do not translate' comment for string 'None'." into mnc-dev
Amit Mahajan [Wed, 8 Jul 2015 18:07:34 +0000 (11:07 -0700)]
Remove 'do not translate' comment for string 'None'.
Bug:
22278463
Change-Id: I29c288cd36cd7b65132b42a4b78749afa81064d6
Sanket Padawe [Wed, 8 Jul 2015 17:15:56 +0000 (17:15 +0000)]
Merge "Locale based string changes in BT." into mnc-dev
Sanket Padawe [Wed, 8 Jul 2015 17:14:54 +0000 (17:14 +0000)]
Merge "Disable CA certificate for EAP-SIM, AKA & AKA'" into mnc-dev
Robin Lee [Wed, 8 Jul 2015 16:27:30 +0000 (16:27 +0000)]
am
64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
* commit '
64e1e15d10b41f6993abf4cb77d220a05f79191a':
Restore Vpn advanced options on re-init or rotate
Robin Lee [Wed, 8 Jul 2015 16:17:22 +0000 (16:17 +0000)]
Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 15:50:30 +0000 (15:50 +0000)]
am
4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
4a332ee8ed15c991e29e46490d2a9d93117bca26':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 15:39:31 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 15:19:19 +0000 (08:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I442dee3b1b41104a76dc1293208010feb77dba7e
Auto-generated-cl: translation import
Jason Monk [Wed, 8 Jul 2015 13:43:21 +0000 (13:43 +0000)]
am
4652115f: Merge "Handle uninstall from notifications list" into mnc-dev
* commit '
4652115f1f75633b0cf3811910b0a5336fd90bf4':
Handle uninstall from notifications list
Jason Monk [Wed, 8 Jul 2015 13:34:40 +0000 (13:34 +0000)]
Merge "Handle uninstall from notifications list" into mnc-dev
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:58:50 +0000 (11:58 +0000)]
am
296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '
296e0aff022196ef2fec934878d8721828bea3f1':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:45:03 +0000 (11:45 +0000)]
Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:10:28 +0000 (11:10 +0000)]
am
461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
* commit '
461a48bac97c24706fd3b2f789648f61a42def42':
Making Settings > Storage multiprofile aware
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 10:54:05 +0000 (10:54 +0000)]
Merge "Making Settings > Storage multiprofile aware" into mnc-dev
Jeff Sharkey [Wed, 8 Jul 2015 05:14:15 +0000 (22:14 -0700)]
Move storage when formatting primary disk.
On devices where the primary storage is configured as a physical
device, and when we adopt that device, automatically move the
primary storage to be hosted on the newly created emulated volume.
Bug:
20275423
Change-Id: I759e65a01b323ef3c9ffb86d0b7c8e7b4768a45c
Christopher Tate [Tue, 7 Jul 2015 23:49:48 +0000 (23:49 +0000)]
am
8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
* commit '
8023385e56e472a55e9c6f5034e04a10f1088f57':
App link handling is not just for "official" verified handlers
Christopher Tate [Tue, 7 Jul 2015 23:35:52 +0000 (23:35 +0000)]
Merge "App link handling is not just for "official" verified handlers" into mnc-dev
Christopher Tate [Wed, 1 Jul 2015 23:52:43 +0000 (16:52 -0700)]
App link handling is not just for "official" verified handlers
Allow apps to be enabled as link handlers for their accepted domains
even when they are not the "official" apps for those domains.
Also clean up a bunch of inconsistent/wrong state reporting in the UI.
Bug
22069429
Change-Id: Ic3b2bcc476dfc30085d3df7412b02bdc5d53df6d
Amith Yamasani [Tue, 7 Jul 2015 20:39:50 +0000 (20:39 +0000)]
am
7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '
7ac21204e16c797cc4f818ccc51509d425ffaf80':
Use localized name for guest user
Amith Yamasani [Tue, 7 Jul 2015 20:20:03 +0000 (20:20 +0000)]
Merge "Use localized name for guest user" into mnc-dev
Zoltan Szatmary-Ban [Wed, 1 Jul 2015 15:45:34 +0000 (16:45 +0100)]
Making Settings > Storage multiprofile aware
Also fixing the order of preferences there.
Bug:
22223456
Bug:
22117317
Change-Id: I9261fe46bfce518fd1ce3d0faef07cffe6869e34
Sanket Padawe [Tue, 7 Jul 2015 19:13:08 +0000 (12:13 -0700)]
Locale based string changes in BT.
Bug:
22219203
Change-Id: Ic920621baf769032475da32ea425097aafa0922e
Jason Monk [Tue, 7 Jul 2015 18:57:47 +0000 (14:57 -0400)]
Handle uninstall from notifications list
Don't crash in InstalledAppDetails on invalid app and finish app
notification details when the app goes away.
Bug:
22311566
Change-Id: I0bb7302dc16dd1a6f3aca152037705ad657d5554
Amith Yamasani [Tue, 7 Jul 2015 17:13:12 +0000 (10:13 -0700)]
Use localized name for guest user
Rather than use the stored name, which depends on the language
in use when the Guest was created, always try to use the localized
word for Guest.
Bug:
22205776
Change-Id: I1a4912b9561196eee811eae31c8df2b72413648f
Zoltan Szatmary-Ban [Tue, 7 Jul 2015 12:24:07 +0000 (13:24 +0100)]
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
Bug:
22291579
Change-Id: I32611404ef5f58c7484fe5c4b7a4f7782cc8daa3
Sanket Padawe [Mon, 6 Jul 2015 23:14:43 +0000 (16:14 -0700)]
Disable CA certificate for EAP-SIM, AKA & AKA'
Bug:
21877800
Change-Id: I66dbb12ebcf94c094d2a71d91d8b2eeef8cf6f48
Jorim Jaggi [Mon, 6 Jul 2015 21:05:44 +0000 (21:05 +0000)]
am
2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit '
2bd619d5ed2cdf5a34c3e3830469edc3b29a6eb0':
Text changes to assist & voice input
Jorim Jaggi [Mon, 6 Jul 2015 20:48:39 +0000 (20:48 +0000)]
Merge "Text changes to assist & voice input" into mnc-dev
Jorim Jaggi [Mon, 6 Jul 2015 18:48:27 +0000 (11:48 -0700)]
Text changes to assist & voice input
Bug:
22063668
Change-Id: I3454f6409d1f5816469505404c77d6a02e53aa50
Robin Lee [Thu, 2 Jul 2015 02:10:22 +0000 (19:10 -0700)]
Restore Vpn advanced options on re-init or rotate
Visibility isn't restored as part of instance state by default.
Bug:
22183281
Change-Id: I86a7165e918251bc32f6884b9ad5f9c5987ca075
Jeff Sharkey [Mon, 6 Jul 2015 18:12:40 +0000 (18:12 +0000)]
am
66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit '
66b5a58a6850cbf3a3fdbb8df913f0fc5ea5bdaa':
Fix init order so we have something to measure.
Jeff Sharkey [Mon, 6 Jul 2015 18:12:39 +0000 (18:12 +0000)]
am
7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit '
7616b00bb5968382c5f49394fc842049f7ce9185':
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.
Jeff Sharkey [Mon, 6 Jul 2015 18:00:32 +0000 (18:00 +0000)]
Merge "Fix init order so we have something to measure." into mnc-dev
Jeff Sharkey [Mon, 6 Jul 2015 17:57:51 +0000 (17:57 +0000)]
Merge changes from topic 'mig' into mnc-dev
* changes:
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.
Jeff Sharkey [Mon, 6 Jul 2015 17:17:42 +0000 (10:17 -0700)]
Fix init order so we have something to measure.
Otherwise we start measuring without shared storage in place, meaning
we always find sizes of 0.
Bug:
22231501
Change-Id: I760064684e76e5ef5cce351aee1d81a971f4d4ea
Geoff Mendal [Mon, 6 Jul 2015 15:02:04 +0000 (15:02 +0000)]
am
e21573da: (-s ours) Import translations. DO NOT MERGE
* commit '
e21573da9205343e5b531f468b534a1bf02098fe':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 14:49:17 +0000 (07:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ca583a0b6b57e1c1cc27e5aaae009e85f906b86
Auto-generated-cl: translation import
Jeff Sharkey [Mon, 6 Jul 2015 05:09:07 +0000 (22:09 -0700)]
Fix some ordering, colors, and accessibility bugs.
When adding preferences to public/private details screens, always
add in-order when rebuilding. Hacky fix for broken summary text and
eject image color tints.
Fix crash when device rotated during partitioning. Set correct
accessibility titles in all wizard steps.
Bug:
22098044,
21376962
Change-Id: I68aff96cba497a91919cad8865722bc9cef7eaa7
Jeff Sharkey [Sun, 5 Jul 2015 21:17:40 +0000 (14:17 -0700)]
Handle missing migration source volume.
Users can try migrating primary storage while the current location
is missing/unmounted. Fail gracefully instead of runtime restarting.
Bug:
21927076
Change-Id: I54b92487faf9e62d5d309734bf4c436a9259d156
Svetoslav [Thu, 2 Jul 2015 02:01:11 +0000 (02:01 +0000)]
Svetoslav [Thu, 2 Jul 2015 01:47:59 +0000 (01:47 +0000)]
Svetoslav [Thu, 2 Jul 2015 01:33:32 +0000 (18:33 -0700)]
Fix build
Change-Id: I658528a9b0a8a281a2b30b2915c1be6963759378
Marco Nelissen [Thu, 2 Jul 2015 01:02:48 +0000 (01:02 +0000)]
am
f35bd641: am
b8b20a50: Merge "Fix USB mode development setting" into mnc-dev
* commit '
f35bd64130ceb668a8fee544ef3b888f51d3eb14':
Fix USB mode development setting
Marco Nelissen [Thu, 2 Jul 2015 00:46:53 +0000 (00:46 +0000)]
am
b8b20a50: Merge "Fix USB mode development setting" into mnc-dev
* commit '
b8b20a503255da8097d64a2f1554d118f8e3c424':
Fix USB mode development setting
Marco Nelissen [Wed, 1 Jul 2015 19:13:43 +0000 (19:13 +0000)]
Merge "Fix USB mode development setting" into mnc-dev
Geoff Mendal [Wed, 1 Jul 2015 17:12:43 +0000 (17:12 +0000)]
am
ad44e83e: (-s ours) am
85a71d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
ad44e83e0acb043e7069f7761300ce265adc6ba0':
Import translations. DO NOT MERGE
Jason Monk [Wed, 1 Jul 2015 17:12:42 +0000 (17:12 +0000)]
Avish Shah [Wed, 1 Jul 2015 17:12:41 +0000 (17:12 +0000)]
am
76ffaaa2: am
ad1f28cd: Device Discoverability not set properly when Bluetooth is toggled
* commit '
76ffaaa238b20cc103e8a08a22d9db1f5990ccff':
Device Discoverability not set properly when Bluetooth is toggled
Geoff Mendal [Wed, 1 Jul 2015 16:21:50 +0000 (16:21 +0000)]
am
85a71d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
85a71d6a622eef2cc5258e737c305227cebe2e95':
Import translations. DO NOT MERGE
Jason Monk [Wed, 1 Jul 2015 16:21:31 +0000 (16:21 +0000)]
Avish Shah [Wed, 1 Jul 2015 16:19:36 +0000 (16:19 +0000)]
am
ad1f28cd: Device Discoverability not set properly when Bluetooth is toggled
* commit '
ad1f28cde0ec117a0d526bae61fb661587914f33':
Device Discoverability not set properly when Bluetooth is toggled
Marco Nelissen [Tue, 30 Jun 2015 21:52:04 +0000 (14:52 -0700)]
Fix USB mode development setting
USB mode consists of the function (mtp, ptp, midi, etc) and the data
locked/unlocked state. Developer settings was only setting the
function, leaving data locked when it should be unlocked.
Bug:
22165902
Change-Id: Ia1ae8dfaf3d2abc62034aa6aea1234bad04aaa2e
Geoff Mendal [Wed, 1 Jul 2015 15:42:32 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 1 Jul 2015 14:52:03 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibe88fd3db790a357712803481a4a3dc2befe22cc
Auto-generated-cl: translation import
Jason Monk [Wed, 1 Jul 2015 14:36:30 +0000 (10:36 -0400)]
Avoid crashing
Bug:
22202631
Change-Id: I1980f77ae4300dbd19d6829dc5974bab0b88d612
Avish Shah [Fri, 19 Jun 2015 11:20:39 +0000 (16:50 +0530)]
Device Discoverability not set properly when Bluetooth is toggled
Issue:
When BT is turned off/on staying in the same BT Settings
screen discoverability was not set again.
Fix:
Handle setting discoverability Bluetooth state change
intents also when BT state is turned ON.
Bug:
21944289
Change-Id: Ic3c8d476c53673b21d40ea2bd9669758d89c2aee
Adam Lesinski [Wed, 1 Jul 2015 01:06:54 +0000 (01:06 +0000)]
am
09948d48: am
56594c6d: Update FakeUid to implement new method defined in BatteryStats.Uid
* commit '
09948d4804f34d76f8e0987efec7b313eb03e3ee':
Update FakeUid to implement new method defined in BatteryStats.Uid
Adam Lesinski [Wed, 1 Jul 2015 00:53:08 +0000 (00:53 +0000)]
am
56594c6d: Update FakeUid to implement new method defined in BatteryStats.Uid
* commit '
56594c6d61c63d6cab28b32f431f6f0d9c84af91':
Update FakeUid to implement new method defined in BatteryStats.Uid
Adam Lesinski [Sat, 27 Jun 2015 01:05:37 +0000 (18:05 -0700)]
Update FakeUid to implement new method defined in BatteryStats.Uid
Bug:
21498425
Change-Id: I956c04d13daf985d472cc7ff2762ad74d5bb9502
Adam Lesinski [Tue, 30 Jun 2015 23:40:59 +0000 (23:40 +0000)]
am
985d1029: am
fba915be: Merge "Merge dex2oat with app being installed" into mnc-dev
* commit '
985d10296a87fe3ffeeec18d51f9af8fc96588ed':
Merge dex2oat with app being installed
Adam Lesinski [Tue, 30 Jun 2015 23:30:15 +0000 (23:30 +0000)]
am
fba915be: Merge "Merge dex2oat with app being installed" into mnc-dev
* commit '
fba915be162f5e32e1a614c5497ef08b216a5b3a':
Merge dex2oat with app being installed
Amith Yamasani [Tue, 30 Jun 2015 23:26:32 +0000 (23:26 +0000)]
am
5bfbc07f: am
a8c4db48: Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev
* commit '
5bfbc07fc761009e2b4116d47d6bda7460061840':
Only allow admin users to adopt sd card as internal storage.
Adam Lesinski [Tue, 30 Jun 2015 23:16:18 +0000 (23:16 +0000)]
Merge "Merge dex2oat with app being installed" into mnc-dev
Amith Yamasani [Tue, 30 Jun 2015 23:13:51 +0000 (23:13 +0000)]
am
a8c4db48: Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev
* commit '
a8c4db48c26634836ade77f3f8f0403089245f9c':
Only allow admin users to adopt sd card as internal storage.
Amith Yamasani [Tue, 30 Jun 2015 23:00:27 +0000 (23:00 +0000)]
Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev
Amith Yamasani [Tue, 30 Jun 2015 21:23:54 +0000 (14:23 -0700)]
Only allow admin users to adopt sd card as internal storage.
Bug:
21883016
Change-Id: I11ca324ab74ce2a8bf13064b4c7735aea132c562
Jason Monk [Tue, 30 Jun 2015 21:22:35 +0000 (21:22 +0000)]
am
f1d70b5f: am
a8af51b2: Merge "Handle adjust volume user restriction" into mnc-dev
* commit '
f1d70b5f7da3929afbc27494539c8e1bbafd77c4':
Handle adjust volume user restriction
Jason Monk [Tue, 30 Jun 2015 20:21:50 +0000 (20:21 +0000)]
am
a8af51b2: Merge "Handle adjust volume user restriction" into mnc-dev
* commit '
a8af51b2d8706455c8c541a4773c883341a5b73c':
Handle adjust volume user restriction
Jason Monk [Tue, 30 Jun 2015 20:08:13 +0000 (20:08 +0000)]
Merge "Handle adjust volume user restriction" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 16:18:26 +0000 (12:18 -0400)]
Handle adjust volume user restriction
- Finish all do not disturb pages immediately
- Disable relevant items in Sounds & notification
Bug:
21642285
Change-Id: I8de9bd10b8cea8adaa306b1ae388ab7d1ccc4e7e
Makoto Onuki [Tue, 30 Jun 2015 17:28:37 +0000 (17:28 +0000)]
am
3ff8ce1d: am
a2bd2eac: Merge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev
* commit '
3ff8ce1d9de9efcf88981f6c9b4b63497be8ae7f':
Make sure Fragments are public for FragMan to instantiate
Makoto Onuki [Tue, 30 Jun 2015 16:54:11 +0000 (16:54 +0000)]
am
a2bd2eac: Merge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev
* commit '
a2bd2eacc3f2688feffafa6ca7050141ad4675eb':
Make sure Fragments are public for FragMan to instantiate
Makoto Onuki [Tue, 30 Jun 2015 16:40:56 +0000 (16:40 +0000)]
Merge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:45:41 +0000 (14:45 +0000)]
am
e6cbdf19: am
e6a0bee5: Merge "Fix crash in ignore optimizations dialog" into mnc-dev
* commit '
e6cbdf19b556436ed6571f2f828ed7c1374f90ce':
Fix crash in ignore optimizations dialog
Jason Monk [Tue, 30 Jun 2015 14:32:58 +0000 (14:32 +0000)]
am
e6a0bee5: Merge "Fix crash in ignore optimizations dialog" into mnc-dev
* commit '
e6a0bee557c8f2ceaa25cd8287511b55479e7293':
Fix crash in ignore optimizations dialog
OSDN Git Service
