OSDN Git Service
Lucky Zhang [Thu, 11 Jun 2015 02:53:12 +0000 (02:53 +0000)]
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
Lucky Zhang [Thu, 11 Jun 2015 01:32:09 +0000 (01:32 +0000)]
am
34450932: Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev
* commit '
34450932b28565edfe3009dfdb2f92476c11671a':
[Settings] Pass lock type extra back to SUW
Nick Kralevich [Wed, 10 Jun 2015 23:16:38 +0000 (23:16 +0000)]
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.
Jason Monk [Wed, 10 Jun 2015 23:15:36 +0000 (23:15 +0000)]
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
Jason Monk [Wed, 10 Jun 2015 23:15:30 +0000 (23:15 +0000)]
am
ac6bb3c2: am
dc748cb3: Merge "App storage settings - Request size onResume" into mnc-dev
* commit '
ac6bb3c23b6d2e0b4bd6003a3c6fbda8f6ba0a0c':
App storage settings - Request size onResume
Jason Monk [Wed, 10 Jun 2015 23:15:28 +0000 (23:15 +0000)]
am
3de2cf4b: am
d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev
* commit '
3de2cf4b2f0cae4b6a86f612f71620dda6495c0c':
New dialog for ignore battery optimizations
Jason Monk [Wed, 10 Jun 2015 23:15:05 +0000 (23:15 +0000)]
am
ef77eb2e: am
f8d131e1: Add string for profile owner usage access warning
* commit '
ef77eb2ecc96936854d5b3473591dfaca16e0ae7':
Add string for profile owner usage access warning
Jeff Brown [Wed, 10 Jun 2015 23:14:44 +0000 (23:14 +0000)]
am
f7b9a021: am
f8f9088a: Merge "Add simulated 4K display modes." into mnc-dev
* commit '
f7b9a0217cc0cfb0bb35811465a560fad8cf8786':
Add simulated 4K display modes.
Lucky Zhang [Wed, 10 Jun 2015 23:01:25 +0000 (23:01 +0000)]
Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev
Nick Kralevich [Wed, 10 Jun 2015 21:25:35 +0000 (21:25 +0000)]
am
8da8e528: Merge "Fix USB access control when adb is disabled." into mnc-dev
* commit '
8da8e528748fccf4b2291536592648a8e99a36d6':
Fix USB access control when adb is disabled.
Nick Kralevich [Wed, 10 Jun 2015 21:11:31 +0000 (21:11 +0000)]
Merge "Fix USB access control when adb is disabled." into mnc-dev
Jason Monk [Wed, 10 Jun 2015 20:38:52 +0000 (20:38 +0000)]
am
a576d55a: Merge "Hide tap to wake on devices that don\'t support it" into mnc-dev
* commit '
a576d55a0e941e1f06c5edffcbcbaa8d01fc2b64':
Hide tap to wake on devices that don't support it
Jason Monk [Wed, 10 Jun 2015 20:26:12 +0000 (20:26 +0000)]
Merge "Hide tap to wake on devices that don't support it" into mnc-dev
Jason Monk [Mon, 8 Jun 2015 13:11:48 +0000 (09:11 -0400)]
Hide tap to wake on devices that don't support it
Bug:
21650579
Change-Id: I3fbcccc80b5773c74d8398f1d23b4762a5bf54ed
Jason Monk [Wed, 10 Jun 2015 20:14:35 +0000 (20:14 +0000)]
am
dc748cb3: Merge "App storage settings - Request size onResume" into mnc-dev
* commit '
dc748cb38ac79fb445d7bbba6f8220a85820d03a':
App storage settings - Request size onResume
Jason Monk [Wed, 10 Jun 2015 20:14:34 +0000 (20:14 +0000)]
am
d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev
* commit '
d09be7ed30d2ed4f3298c3075f506612b91a5878':
New dialog for ignore battery optimizations
Jason Monk [Wed, 10 Jun 2015 20:12:06 +0000 (20:12 +0000)]
Merge "App storage settings - Request size onResume" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 20:08:01 +0000 (16:08 -0400)]
App storage settings - Request size onResume
Our data might be stale (especially when coming from manage space
activities).
Bug:
21680510
Change-Id: Ifb919e05f23f76677b6de2aff3d13d00e195facb
Jason Monk [Wed, 10 Jun 2015 20:06:09 +0000 (20:06 +0000)]
Merge "New dialog for ignore battery optimizations" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 19:55:01 +0000 (19:55 +0000)]
am
f8d131e1: Add string for profile owner usage access warning
* commit '
f8d131e181a273ed8664222e754b10a5824d56ac':
Add string for profile owner usage access warning
Jason Monk [Wed, 10 Jun 2015 15:03:06 +0000 (11:03 -0400)]
New dialog for ignore battery optimizations
Bug:
21375688
Change-Id: I7240cc0615044cf5a34349e5ffdf2ae2e0f6333f
Lucky Zhang [Wed, 10 Jun 2015 18:05:09 +0000 (11:05 -0700)]
[Settings] Pass lock type extra back to SUW
When SetupChooseLockGeneric finishes, it will include the lock type
(password quality) as an extra in the returned intent data. This extra
will be used by Setup Wizard to determine the lock type and log it for
the metrics.
Bug:
20349248
Change-Id: I501e07254ab857ad4f137e7050326415853883d1
Jeff Brown [Wed, 10 Jun 2015 19:33:02 +0000 (19:33 +0000)]
am
f8f9088a: Merge "Add simulated 4K display modes." into mnc-dev
* commit '
f8f9088a6def1186038c35ec3319113262825f20':
Add simulated 4K display modes.
Jason Monk [Wed, 10 Jun 2015 19:26:35 +0000 (15:26 -0400)]
Add string for profile owner usage access warning
Bug:
20751702
Change-Id: Ib885befdefa18d21a243478d59b1d240bc7a1c68
Jeff Brown [Wed, 10 Jun 2015 19:21:09 +0000 (19:21 +0000)]
Merge "Add simulated 4K display modes." into mnc-dev
Xiyuan Xia [Wed, 10 Jun 2015 17:32:43 +0000 (17:32 +0000)]
am
a218ebb0: am
9823f279: Merge "Implement default assist app setting" into mnc-dev
* commit '
a218ebb090e3ac06d5c324bafb89e2d4d3ef7741':
Implement default assist app setting
Nick Kralevich [Wed, 10 Jun 2015 16:39:26 +0000 (09:39 -0700)]
Fix USB access control when adb is disabled.
When adb is disabled, the default usb mode would be "none", which
would turn off the driver and prevent UsbDeviceManager from receiving
any new USB connect / disconnect messages. This prevents the user
from ever enabling MTP and sharing data when adb is turned off.
As discussed in bug
21429947, we work around this problem by keeping
the USB driver in MTP mode most of the time, so that we continue to
receive USB connect / disconnect messages.
To avoid leaking confidential user photos, we now explicitly unlock
USB data after switching into MTP/PTP mode. Enabling MTP mode is
now decoupled from exposing data on the USB connection.
Bug:
21429947
Change-Id: Id8e9df4ac42fdcf22cc5b75b838bf46f6c225081
Xiyuan Xia [Wed, 10 Jun 2015 17:21:01 +0000 (17:21 +0000)]
am
9823f279: Merge "Implement default assist app setting" into mnc-dev
* commit '
9823f27936d07ef1f7ce0d79eca39c3f053d3e62':
Implement default assist app setting
Xiyuan Xia [Wed, 10 Jun 2015 17:08:43 +0000 (17:08 +0000)]
Merge "Implement default assist app setting" into mnc-dev
Makoto Onuki [Wed, 10 Jun 2015 17:00:06 +0000 (17:00 +0000)]
am
c81dad78: am
0bd18745: Merge "Show list of permissions instead of just numbers" into mnc-dev
* commit '
c81dad78ea6ecf5819f07790126ba7424b7a7499':
Show list of permissions instead of just numbers
Makoto Onuki [Wed, 10 Jun 2015 16:51:24 +0000 (16:51 +0000)]
am
0bd18745: Merge "Show list of permissions instead of just numbers" into mnc-dev
* commit '
0bd18745cff354f6994b70e71f3ab6b7e98fe004':
Show list of permissions instead of just numbers
Makoto Onuki [Wed, 10 Jun 2015 16:39:06 +0000 (16:39 +0000)]
Merge "Show list of permissions instead of just numbers" into mnc-dev
Lorenzo Colitti [Wed, 10 Jun 2015 15:56:36 +0000 (15:56 +0000)]
am
a41c3580: am
275e6f75: Merge changes from topic \'no-internet-notification\' into mnc-dev
* commit '
a41c3580a96edce8e0dfbec6a7a4ad8ef2c9bf0c':
Pass in the netId using intent data, not intent extras.
Reword "no internet access" dialog to conform with mocks.
Geoff Mendal [Wed, 10 Jun 2015 15:56:35 +0000 (15:56 +0000)]
am
f0e5a755: (-s ours) am
3e0514d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
f0e5a7550866f6b6f2e385fc56b70c16848206ad':
Import translations. DO NOT MERGE
Jason Monk [Wed, 10 Jun 2015 15:56:34 +0000 (15:56 +0000)]
am
fba2680e: am
f9402321: Fix legal info back button
* commit '
fba2680ebb63f0195b3267b7dec8d9cc413896fd':
Fix legal info back button
Xiyuan Xia [Tue, 2 Jun 2015 21:55:32 +0000 (14:55 -0700)]
Implement default assist app setting
- Add "None" support to AppListPreference
- Add DefaultAssistPreference to manage assist;
- Add AppListPreferenceWithSettings to show a settings icon;
- Implement DefaultAssistPreference based on AppListPreferenceWithSettings;
- Move voice input settings into ManageAssist and implement it
based on AppListPreferenceWithSettings;
Bug:
20210110
Change-Id: If283b8b55a46b428ecfa6e45dc2123292b1d4302
Lorenzo Colitti [Wed, 10 Jun 2015 15:42:35 +0000 (15:42 +0000)]
am
275e6f75: Merge changes from topic \'no-internet-notification\' into mnc-dev
* commit '
275e6f75208c08eb925048a330ed4aab96e51033':
Pass in the netId using intent data, not intent extras.
Reword "no internet access" dialog to conform with mocks.
Geoff Mendal [Wed, 10 Jun 2015 15:42:34 +0000 (15:42 +0000)]
am
3e0514d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
3e0514d7464c8da8fb4ce7fb132410cb53573bef':
Import translations. DO NOT MERGE
Jason Monk [Wed, 10 Jun 2015 15:42:16 +0000 (15:42 +0000)]
am
f9402321: Fix legal info back button
* commit '
f94023216accd128b06acdc50950e455a60a9c4e':
Fix legal info back button
Lorenzo Colitti [Wed, 10 Jun 2015 15:25:24 +0000 (15:25 +0000)]
Merge changes from topic 'no-internet-notification' into mnc-dev
* changes:
Pass in the netId using intent data, not intent extras.
Reword "no internet access" dialog to conform with mocks.
Geoff Mendal [Wed, 10 Jun 2015 15:25:01 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Chris Wren [Wed, 10 Jun 2015 15:11:55 +0000 (15:11 +0000)]
am
fa8889a8: am
da6a4904: Merge "annoint new constants" into mnc-dev
* commit '
fa8889a88c162595b8cac8d2749dff401a5ea39c':
annoint new constants
Jason Monk [Wed, 10 Jun 2015 15:11:54 +0000 (15:11 +0000)]
am
5365a8fd: am
caec03f9: Remove periods from ignore optimizations summaries
* commit '
5365a8fd3a2aee18a0d6faecd43ad2994a09951c':
Remove periods from ignore optimizations summaries
Jason Monk [Wed, 10 Jun 2015 15:11:53 +0000 (15:11 +0000)]
am
5b23db3c: am
cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev
* commit '
5b23db3ce61e5d2e43bb0f0757cf823c2d8f3d4d':
Advanced apps updates (2/2)
Jason Monk [Wed, 10 Jun 2015 15:11:52 +0000 (15:11 +0000)]
am
6c6a212f: am
6f9b6e08: Merge "Add sd card string, just in case" into mnc-dev
* commit '
6c6a212f0351a5711224f684c73123ff81d1504d':
Add sd card string, just in case
Neil Fuller [Wed, 10 Jun 2015 15:11:47 +0000 (15:11 +0000)]
am
54786a6a: am
c28330ec: Merge "Modifications for changes to SettingsLib" into mnc-dev
* commit '
54786a6adf695dcc1378bdbfc261590c91d0199a':
Modifications for changes to SettingsLib
Jason Monk [Wed, 10 Jun 2015 14:02:59 +0000 (10:02 -0400)]
Fix legal info back button
Make it its own SettingsPreferenceFragment.
whitespace--
Bug:
20727881
Change-Id: I1f790af03d316c1d43377a6d8606084d9f3a747f
Geoff Mendal [Wed, 10 Jun 2015 15:04:57 +0000 (08:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7e0cc3842d3422193de12b6b718237995f25db68
Auto-generated-cl: translation import
Chris Wren [Wed, 10 Jun 2015 14:54:38 +0000 (14:54 +0000)]
am
da6a4904: Merge "annoint new constants" into mnc-dev
* commit '
da6a4904a9b6370b9a4ceeab6f8ecc08738a2c7b':
annoint new constants
Jason Monk [Wed, 10 Jun 2015 14:54:09 +0000 (14:54 +0000)]
am
caec03f9: Remove periods from ignore optimizations summaries
* commit '
caec03f9e51469776242908b4d877d7248c52875':
Remove periods from ignore optimizations summaries
Jason Monk [Wed, 10 Jun 2015 14:54:08 +0000 (14:54 +0000)]
am
cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev
* commit '
cc0f3b75b2692c7b57b2e839b18d224ed51f8082':
Advanced apps updates (2/2)
Jason Monk [Wed, 10 Jun 2015 14:54:07 +0000 (14:54 +0000)]
am
6f9b6e08: Merge "Add sd card string, just in case" into mnc-dev
* commit '
6f9b6e08a80b1d1e114808d1ac42e132888df185':
Add sd card string, just in case
Neil Fuller [Wed, 10 Jun 2015 14:53:56 +0000 (14:53 +0000)]
am
c28330ec: Merge "Modifications for changes to SettingsLib" into mnc-dev
* commit '
c28330ec3e6e808427cc17fd4060c3c0a7fa3462':
Modifications for changes to SettingsLib
Lorenzo Colitti [Wed, 10 Jun 2015 13:49:52 +0000 (22:49 +0900)]
Pass in the netId using intent data, not intent extras.
This allows ConnectivityService to use different PendingIntents
for different dialogs; two PendingIntents that differ in their
data are treated as different, but two PendingIntents that differ
only in their extras are treated as being the same.
Bug:
20081183
Change-Id: Ie1bdcf2a0a0747be815ea528db0cb34f5ab415b9
Lorenzo Colitti [Wed, 10 Jun 2015 06:16:36 +0000 (15:16 +0900)]
Reword "no internet access" dialog to conform with mocks.
Bug:
20081183
Bug:
20739299
Change-Id: I63e58dafcba879c56669766f652729a73ef722e2
Chris Wren [Wed, 10 Jun 2015 14:14:38 +0000 (14:14 +0000)]
Merge "annoint new constants" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 13:04:14 +0000 (09:04 -0400)]
Remove periods from ignore optimizations summaries
Bug:
21375688
Change-Id: Id37cbac60db461bfc0da505ad5d4346382c8e76c
Jason Monk [Wed, 10 Jun 2015 12:59:32 +0000 (12:59 +0000)]
Merge "Advanced apps updates (2/2)" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 12:59:29 +0000 (12:59 +0000)]
Merge "Add sd card string, just in case" into mnc-dev
Neil Fuller [Wed, 10 Jun 2015 12:23:45 +0000 (12:23 +0000)]
Merge "Modifications for changes to SettingsLib" into mnc-dev
Jeff Brown [Wed, 10 Jun 2015 01:25:04 +0000 (18:25 -0700)]
Add simulated 4K display modes.
Bug:
18241736
Change-Id: Ic56a756601dd1cc1bf125fe30965f80d63d92b4e
Fyodor Kupolov [Tue, 9 Jun 2015 23:23:44 +0000 (23:23 +0000)]
am
af27f96b: am
8e2c4787: Merge "Guest option should not be shown for the guest user" into mnc-dev
* commit '
af27f96bc61ed23658696d440919b286ea4d747a':
Guest option should not be shown for the guest user
Fyodor Kupolov [Tue, 9 Jun 2015 23:06:14 +0000 (23:06 +0000)]
am
8e2c4787: Merge "Guest option should not be shown for the guest user" into mnc-dev
* commit '
8e2c47870188c0732a1130b505748f07b23fa66c':
Guest option should not be shown for the guest user
Fyodor Kupolov [Tue, 9 Jun 2015 22:57:26 +0000 (22:57 +0000)]
Merge "Guest option should not be shown for the guest user" into mnc-dev
Fyodor Kupolov [Tue, 9 Jun 2015 22:54:28 +0000 (15:54 -0700)]
Guest option should not be shown for the guest user
Bug:
21649480
Change-Id: I866e34543c6ba396533f9acfef056390cf19608d
Casper Bonde [Tue, 9 Jun 2015 22:09:38 +0000 (22:09 +0000)]
am
b9484071: am
e278a208: SAP: Make it possible to enforce a 16-digit pin code (5/5)
* commit '
b94840712e9257e6f38446c7d7a3c4d3d79cf089':
SAP: Make it possible to enforce a 16-digit pin code (5/5)
Casper Bonde [Tue, 9 Jun 2015 21:56:56 +0000 (21:56 +0000)]
am
e278a208: SAP: Make it possible to enforce a 16-digit pin code (5/5)
* commit '
e278a208bc8298963080dfb5352acedc65aad083':
SAP: Make it possible to enforce a 16-digit pin code (5/5)
Casper Bonde [Fri, 8 May 2015 13:19:03 +0000 (15:19 +0200)]
SAP: Make it possible to enforce a 16-digit pin code (5/5)
This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.
This is needed for the SIM access profile.
Change-Id: I6bb2b0dff1ebf4b4f1d8faad97aa7c480000d3ea
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
Paul Lawrence [Tue, 9 Jun 2015 21:26:11 +0000 (21:26 +0000)]
am
cb3063dd: am
2114e386: Merge "Move CryptKeeper to own process" into mnc-dev
* commit '
cb3063ddda573d297b769b3134d1ebb673863393':
Move CryptKeeper to own process
Paul Lawrence [Tue, 9 Jun 2015 21:12:35 +0000 (21:12 +0000)]
am
2114e386: Merge "Move CryptKeeper to own process" into mnc-dev
* commit '
2114e386a4fabe060784a7077eaee9e13ef3af59':
Move CryptKeeper to own process
Paul Lawrence [Tue, 9 Jun 2015 20:56:24 +0000 (20:56 +0000)]
Merge "Move CryptKeeper to own process" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 20:59:19 +0000 (20:59 +0000)]
am
0087749f: am
51f7c067: Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev
* commit '
0087749f66d299f1687475f56f340cf9cc42ef51':
Top level: "Storage" -> "Storage & USB"
Jason Monk [Tue, 9 Jun 2015 20:40:10 +0000 (20:40 +0000)]
am
51f7c067: Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev
* commit '
51f7c067aac2d9326ff0569027d0dff2aa67f538':
Top level: "Storage" -> "Storage & USB"
Jason Monk [Tue, 9 Jun 2015 20:30:34 +0000 (20:30 +0000)]
Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 20:25:32 +0000 (16:25 -0400)]
Add sd card string, just in case
Bug:
21471429
Change-Id: Iac3cd1643b8aa3a62a0c97c8046cb365dfeaf527
Jason Monk [Tue, 9 Jun 2015 20:16:11 +0000 (20:16 +0000)]
am
8987128d: am
4ab327b0: Merge "Accounts -> Account sync" into mnc-dev
* commit '
8987128dfa186685ac6a4f73993eea68a20da014':
Accounts -> Account sync
Jason Monk [Tue, 9 Jun 2015 20:16:10 +0000 (20:16 +0000)]
am
3ab21b90: am
fed12068: Merge "Bring back gear icon for advanced app settings" into mnc-dev
* commit '
3ab21b90a7835da0ff6add47cff5edccbfcdbe93':
Bring back gear icon for advanced app settings
Jason Monk [Tue, 9 Jun 2015 20:04:36 +0000 (20:04 +0000)]
am
4ab327b0: Merge "Accounts -> Account sync" into mnc-dev
* commit '
4ab327b05fe36d2841a89e3d9ba34d7df4027a91':
Accounts -> Account sync
Jason Monk [Tue, 9 Jun 2015 20:04:34 +0000 (20:04 +0000)]
am
fed12068: Merge "Bring back gear icon for advanced app settings" into mnc-dev
* commit '
fed12068e0068759870fe9ba9bdff08f76068c12':
Bring back gear icon for advanced app settings
Jason Monk [Tue, 9 Jun 2015 20:01:28 +0000 (16:01 -0400)]
Advanced apps updates (2/2)
Change the title of the screen, add a category to break things up
Bug:
21372377
Change-Id: I03c2060937f540235755e4b74c5634543e526d25
Jason Monk [Tue, 9 Jun 2015 19:50:11 +0000 (19:50 +0000)]
Merge "Accounts -> Account sync" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 19:49:22 +0000 (19:49 +0000)]
Merge "Bring back gear icon for advanced app settings" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 19:49:20 +0000 (19:49 +0000)]
am
4afe7429: am
86333477: Add strings that will be used for new ignore opt ux
* commit '
4afe7429c7c15e2e5d6d657e02855148346244ba':
Add strings that will be used for new ignore opt ux
Jason Monk [Tue, 9 Jun 2015 19:45:17 +0000 (15:45 -0400)]
Bring back gear icon for advanced app settings
Bug:
21372377
Change-Id: Id7192d4f3f019d099b530a7acc6556054e92dfba
Jason Monk [Tue, 9 Jun 2015 19:39:02 +0000 (19:39 +0000)]
am
86333477: Add strings that will be used for new ignore opt ux
* commit '
86333477b7913eccf628b7c0ac081fd7f0634b52':
Add strings that will be used for new ignore opt ux
Jason Monk [Tue, 9 Jun 2015 19:32:14 +0000 (15:32 -0400)]
Top level: "Storage" -> "Storage & USB"
Bug:
21324048
Change-Id: I42853135e3a119b84b86a96968053d64313a4b92
Jason Monk [Tue, 9 Jun 2015 19:19:11 +0000 (15:19 -0400)]
Add strings that will be used for new ignore opt ux
Bug:
21375688
Change-Id: Ifb01e2a1fe9a1d4ae55acafa046080740e8bc5dc
Jason Monk [Tue, 9 Jun 2015 18:46:57 +0000 (14:46 -0400)]
Accounts -> Account sync
Bug:
21726868
Change-Id: I806730a338f4320398766dfd32867656bced77fe
Chris Wren [Tue, 9 Jun 2015 18:24:03 +0000 (14:24 -0400)]
annoint new constants
Bug:
21114836
Change-Id: I63fb1da67a6f6d8dfad076e7e1c2cef0783c17f9
Tony Mantler [Tue, 9 Jun 2015 17:46:51 +0000 (17:46 +0000)]
am
20296c96: am
8c39a9c6: Merge "Move ApplicationsState to SettingsLib" into mnc-dev
* commit '
20296c966023a1fc3ae5b08950fc6a36becd8bf1':
Move ApplicationsState to SettingsLib
Tony Mantler [Tue, 9 Jun 2015 17:32:39 +0000 (17:32 +0000)]
am
8c39a9c6: Merge "Move ApplicationsState to SettingsLib" into mnc-dev
* commit '
8c39a9c6f28f2b31635cae77d045b38fd3b7c2d9':
Move ApplicationsState to SettingsLib
Tony Mantler [Tue, 9 Jun 2015 17:20:16 +0000 (17:20 +0000)]
Merge "Move ApplicationsState to SettingsLib" into mnc-dev
Sudheer Shanka [Tue, 9 Jun 2015 17:02:49 +0000 (17:02 +0000)]
am
ec547789: am
b259b384: Merge "Update some strings." into mnc-dev
* commit '
ec54778989fa3f04c97770477b4db4728e474324':
Update some strings.
Chris Wren [Tue, 9 Jun 2015 16:44:16 +0000 (16:44 +0000)]
am
455b27ee: am
c7581e81: instrument display rotation settings
* commit '
455b27eee06ff6577453936e531186caca000d56':
instrument display rotation settings
Chris Wren [Tue, 9 Jun 2015 16:44:15 +0000 (16:44 +0000)]
am
5d66e170: am
18213459: don\'t double set the dropdown value
* commit '
5d66e17002053fe759c47cb5aae26f70e677e248':
don't double set the dropdown value
Sudheer Shanka [Tue, 9 Jun 2015 16:35:22 +0000 (16:35 +0000)]
am
b259b384: Merge "Update some strings." into mnc-dev
* commit '
b259b3845739f6b66a77b0fb9a14069cb7ff9122':
Update some strings.
Sudheer Shanka [Tue, 9 Jun 2015 16:24:13 +0000 (16:24 +0000)]
Merge "Update some strings." into mnc-dev
Chris Wren [Tue, 9 Jun 2015 16:23:32 +0000 (16:23 +0000)]
am
c7581e81: instrument display rotation settings
* commit '
c7581e8126cefcbac599e95db664dd675c95ef18':
instrument display rotation settings
Chris Wren [Tue, 9 Jun 2015 16:23:31 +0000 (16:23 +0000)]
am
18213459: don\'t double set the dropdown value
* commit '
182134595b9ba63607afceca9c77d62a6ac74066':
don't double set the dropdown value
Chris Wren [Tue, 9 Jun 2015 16:07:14 +0000 (12:07 -0400)]
instrument display rotation settings
Bug:
21530764
Change-Id: Iee36addb7cf3cb6abbbf1ac90727e0fce22121cb
OSDN Git Service
