OSDN Git Service
Maurice Lam [Wed, 27 Aug 2014 17:11:35 +0000 (17:11 +0000)]
am
cf3c9ba2: Merge "[WifiSetup] Progress when wifi scanning" into lmp-dev
* commit '
cf3c9ba291f21058d4c86b31d4368b29b10e1952':
[WifiSetup] Progress when wifi scanning
Maurice Lam [Wed, 27 Aug 2014 17:04:46 +0000 (17:04 +0000)]
Merge "[WifiSetup] Progress when wifi scanning" into lmp-dev
Baligh Uddin [Wed, 27 Aug 2014 16:33:40 +0000 (16:33 +0000)]
am
29b5ef28: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
29b5ef288a77b70b006cd1d3e6cd5738a67d6092':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Aug 2014 16:23:19 +0000 (16:23 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Wed, 27 Aug 2014 03:49:33 +0000 (20:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8ac9cf419f62a3420117bcaaffe4dca023ee1c9d
Auto-generated-cl: translation import
Sander Alewijnse [Tue, 26 Aug 2014 17:07:18 +0000 (17:07 +0000)]
am
320dc051: Merge "Add extra to home settings starting intent." into lmp-dev
* commit '
320dc05125c0db44c1182c4f5568bef440f643c8':
Add extra to home settings starting intent.
Sander Alewijnse [Tue, 26 Aug 2014 16:59:23 +0000 (16:59 +0000)]
Merge "Add extra to home settings starting intent." into lmp-dev
Alan Viverette [Mon, 25 Aug 2014 23:29:01 +0000 (23:29 +0000)]
am
c61aabfa: Merge "Update material colors" into lmp-dev
* commit '
c61aabfa22e972a5173d2edc2aa5fd77fb37bdf9':
Update material colors
Amith Yamasani [Mon, 25 Aug 2014 23:29:00 +0000 (23:29 +0000)]
am
e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev
* commit '
e352845ecad452823bb2c3ba1b0eb1abf2e9a442':
Fix toggle button clickability in app restrictions
Alan Viverette [Mon, 25 Aug 2014 23:18:33 +0000 (23:18 +0000)]
Merge "Update material colors" into lmp-dev
Amith Yamasani [Mon, 25 Aug 2014 22:51:09 +0000 (22:51 +0000)]
Merge "Fix toggle button clickability in app restrictions" into lmp-dev
Alan Viverette [Mon, 25 Aug 2014 23:05:50 +0000 (16:05 -0700)]
Update material colors
BUG:
17212898
Change-Id: Idb1c391de3c1fb150f06c3cf744780be1404d2e5
Nancy Chen [Mon, 25 Aug 2014 22:47:23 +0000 (22:47 +0000)]
am
a1ca4ed1: Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev
* commit '
a1ca4ed14d12cd3daa8bb5db5527676ca78c1850':
API Review PhoneManager -> TelecommManager. Rename methods (3/6)
Nancy Chen [Mon, 25 Aug 2014 22:24:14 +0000 (22:24 +0000)]
Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev
Amith Yamasani [Mon, 25 Aug 2014 22:20:34 +0000 (15:20 -0700)]
Fix toggle button clickability in app restrictions
Also fix side padding
Bug:
17159406
Change-Id: Ic1d61d9a4a7ae6f3f7c451405a6e127791edbdaf
Paul Lawrence [Mon, 25 Aug 2014 22:09:41 +0000 (22:09 +0000)]
am
ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev
* commit '
ee2a85c7c8a91db3067d9908b4b04d329a40ba71':
Honor hide pattern on crypto screen
Paul Lawrence [Mon, 25 Aug 2014 21:59:26 +0000 (21:59 +0000)]
Merge "Honor hide pattern on crypto screen" into lmp-dev
Maurice Lam [Mon, 25 Aug 2014 01:29:40 +0000 (18:29 -0700)]
[WifiSetup] Progress when wifi scanning
Use a custom empty view to show the status while wifi is scanning
or off. Cannot use android.R.id.empty because in phone portrait
layout the illustration is the listview header, which will be hidden
if the list is empty and we use ListView.setEmptyView.
Bug:
17183006
Change-Id: Ie8598303f4e61f87e078008fb7a03918ba92c9ef
PauloftheWest [Mon, 25 Aug 2014 16:55:21 +0000 (16:55 +0000)]
am
aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev
* commit '
aa5c7565e42efdfa5ae5506a0a9dfd4f05461034':
Updated Tethering and portable hotspot to use switches.
PauloftheWest [Mon, 25 Aug 2014 16:44:25 +0000 (16:44 +0000)]
Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev
Baligh Uddin [Mon, 25 Aug 2014 16:32:55 +0000 (16:32 +0000)]
am
cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
cef6b220d6bf5c6ad003d2d528ad4dea305adf60':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 25 Aug 2014 16:21:03 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
PauloftheWest [Mon, 25 Aug 2014 15:58:29 +0000 (15:58 +0000)]
am
7560e22d: Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev
* commit '
7560e22d7602250172f6e6ca16fdea0063348d15':
Tapping a connected Bluetooth device now presents its settings dialog.
PauloftheWest [Mon, 25 Aug 2014 15:48:15 +0000 (15:48 +0000)]
Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev
PauloftheWest [Sun, 24 Aug 2014 18:59:35 +0000 (11:59 -0700)]
Updated Tethering and portable hotspot to use switches.
Bug:
17020102
Change-Id: I5da1745d4ea9545f8960c015ca6858fb0a34de0d
PauloftheWest [Sun, 24 Aug 2014 21:04:18 +0000 (14:04 -0700)]
Tapping a connected Bluetooth device now presents its settings dialog.
Bug:
14184769
Change-Id: I1de3110dd7460e0329dbe6df99abf3451d3041cc
Baligh Uddin [Sun, 24 Aug 2014 20:07:11 +0000 (13:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib13840b4fe07abc8aba474a3b0abf4b06fdb4405
Auto-generated-cl: translation import
Dianne Hackborn [Sun, 24 Aug 2014 18:59:46 +0000 (18:59 +0000)]
am
c436b159: Merge "Tweak voice settings strings." into lmp-dev
* commit '
c436b159534240c64281447860a81e519bf7c07d':
Tweak voice settings strings.
Dianne Hackborn [Sun, 24 Aug 2014 18:53:16 +0000 (18:53 +0000)]
Merge "Tweak voice settings strings." into lmp-dev
Dianne Hackborn [Sat, 23 Aug 2014 21:11:12 +0000 (14:11 -0700)]
Tweak voice settings strings.
Change-Id: I4cb6badaf2d013d43d87bc8ecdc0763c4e5d6b50
Amith Yamasani [Sat, 23 Aug 2014 01:21:51 +0000 (01:21 +0000)]
am
8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev
* commit '
8fe710682ad3f5a5ac0ed1393f3d934bea122bc5':
Don't index the ChooseLockGeneric screen
Jeff Davidson [Sat, 23 Aug 2014 01:12:46 +0000 (01:12 +0000)]
am
8e6edba5: Merge "Restore legacy VPN stats dialog." into lmp-dev
* commit '
8e6edba5606fd717a631aabcc4c5702bdd509033':
Restore legacy VPN stats dialog.
Amith Yamasani [Sat, 23 Aug 2014 01:07:02 +0000 (01:07 +0000)]
Merge "Don't index the ChooseLockGeneric screen" into lmp-dev
Jeff Davidson [Sat, 23 Aug 2014 00:55:38 +0000 (00:55 +0000)]
Merge "Restore legacy VPN stats dialog." into lmp-dev
Amith Yamasani [Fri, 22 Aug 2014 22:38:16 +0000 (15:38 -0700)]
Don't index the ChooseLockGeneric screen
This avoids indexing face unlock, which may not always exist or might
be disabled by policy.
Instead, add some of the relevant keywords up one level in Security
settings.
Bug:
17185326
Change-Id: I4fbae1c0384a97383707104a6fe283075edbf341
Jim Miller [Fri, 22 Aug 2014 22:34:45 +0000 (22:34 +0000)]
am
1351b0fb: Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
* commit '
1351b0fbcddea9cc66941e8af1de148142b92201':
Show trust agent entries as disabled rather than removing them.
Jim Miller [Fri, 22 Aug 2014 22:25:15 +0000 (22:25 +0000)]
Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
Nancy Chen [Fri, 22 Aug 2014 05:53:05 +0000 (22:53 -0700)]
API Review PhoneManager -> TelecommManager. Rename methods (3/6)
PhoneManager
- handlePinMMI docs should explain what a Pin is and what MMI is
- rename isInAPhoneCall to isInCall
- rename showCallScreen to showInCallScreen
- merge this class into TelecommManager, we don't need both
Bug:
16960458
Change-Id: I8285f15747b66fdfad93d203d848d4a62c0f9b2a
Elliott Hughes [Fri, 22 Aug 2014 20:51:00 +0000 (20:51 +0000)]
am
d5ee3bc8: Merge "Settings psuedolocalization fixes." into lmp-dev
* commit '
d5ee3bc858f2e3c7e4dee6887c982c768c355c7a':
Settings psuedolocalization fixes.
Elliott Hughes [Fri, 22 Aug 2014 20:42:37 +0000 (20:42 +0000)]
Merge "Settings psuedolocalization fixes." into lmp-dev
Jeff Davidson [Fri, 22 Aug 2014 20:12:01 +0000 (13:12 -0700)]
Restore legacy VPN stats dialog.
Was originally removed in ag/522961, but restoring to keep legacy VPN
behavior the same from within VpnSettings. This dialog is only
accesible from VpnSettings and so should only ever be shown for legacy
VPNs.
Bug:
17164793
Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b
Amith Yamasani [Fri, 22 Aug 2014 19:41:59 +0000 (19:41 +0000)]
am
8802ccf8: Merge "Switch user on clicking on a user in User Settings" into lmp-dev
* commit '
8802ccf853b86ba56816ddd06346812b61e58220':
Switch user on clicking on a user in User Settings
Amith Yamasani [Fri, 22 Aug 2014 19:37:09 +0000 (19:37 +0000)]
Merge "Switch user on clicking on a user in User Settings" into lmp-dev
Amith Yamasani [Fri, 22 Aug 2014 19:33:23 +0000 (12:33 -0700)]
Switch user on clicking on a user in User Settings
This slipped out of the code somehow.
Bug:
15761405
Change-Id: I89c47221f999d5ef23aa7910d31a95bfa730353c
Elliott Hughes [Fri, 22 Aug 2014 19:06:23 +0000 (12:06 -0700)]
Settings psuedolocalization fixes.
We don't need -c zz_ZZ any more, and LocalePicker now checks
the global developer options settings itself.
Also remove some dead code now zz_ZY and zz_ZZ are gone.
Bug:
17190407
Change-Id: I27f9f5bc8b27457004e7e4996ec76b76a17523eb
Baligh Uddin [Fri, 22 Aug 2014 17:32:04 +0000 (17:32 +0000)]
am
3723625f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
3723625fecf9d1402e4d1747d9342ed12235184e':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Aug 2014 17:24:31 +0000 (17:24 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Jessica Hummel [Fri, 22 Aug 2014 14:42:05 +0000 (14:42 +0000)]
am
2e9e044e: Final tweaks to work profile strings
* commit '
2e9e044ed2c3dbbcd7ce01d2c8b6e00f452cf31b':
Final tweaks to work profile strings
Jessica Hummel [Fri, 22 Aug 2014 10:28:51 +0000 (11:28 +0100)]
Final tweaks to work profile strings
Change-Id: Icd8f3ac2e8e3fb7f0368cdf40bcd42b4f275258b
bug:
15744182
Alexandra Gherghina [Fri, 22 Aug 2014 13:01:59 +0000 (13:01 +0000)]
am
9239d6d0: Merge "Update strings for removing work profile" into lmp-dev
* commit '
9239d6d0a2fd01170b6188a6b92bd716ca962c65':
Update strings for removing work profile
Alexandra Gherghina [Fri, 22 Aug 2014 13:01:58 +0000 (13:01 +0000)]
am
9c4d5dd8: Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev
* commit '
9c4d5dd86b250dbb0ce9fe5dc9339a7fd7798981':
Modify Spinner so that the arrow is closer to the text
Alexandra Gherghina [Fri, 22 Aug 2014 12:53:28 +0000 (12:53 +0000)]
Merge "Update strings for removing work profile" into lmp-dev
Alexandra Gherghina [Fri, 22 Aug 2014 12:53:18 +0000 (12:53 +0000)]
Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev
Alexandra Gherghina [Fri, 22 Aug 2014 10:17:29 +0000 (11:17 +0100)]
Update strings for removing work profile
Bug:
17139301
Change-Id: I524946ab7856b10ed68a2e90c7f488d20731b169
Jim Miller [Fri, 22 Aug 2014 02:24:47 +0000 (19:24 -0700)]
Show trust agent entries as disabled rather than removing them.
Fixes bug
17108810
Change-Id: I646f5c299cd680d5c3a4978610f3852eba4b116b
Maurice Lam [Fri, 22 Aug 2014 01:34:31 +0000 (01:34 +0000)]
am
8be27595: Merge "[WifiSetup] Tablet portrait layout" into lmp-dev
* commit '
8be27595766a632da8ef78a0a8eaa8dc041232d8':
[WifiSetup] Tablet portrait layout
Maurice Lam [Fri, 22 Aug 2014 01:22:24 +0000 (01:22 +0000)]
Merge "[WifiSetup] Tablet portrait layout" into lmp-dev
Paul Lawrence [Wed, 20 Aug 2014 14:43:32 +0000 (07:43 -0700)]
Honor hide pattern on crypto screen
Also clear pattern a little more quickly, and show owner info
even from before encrypting (since we're fixing pattern visible,
we should fix owner info too in the same way)
Bug:
17059314
Change-Id: Ie9ccd4a892a1dec32ebe60567d3b72dd6fe25060
Amith Yamasani [Thu, 21 Aug 2014 21:03:27 +0000 (21:03 +0000)]
am
2534be37: Merge "Fix layout of Apn Settings screen" into lmp-dev
* commit '
2534be37462f9ab5c98ca07758d71f98019eddf4':
Fix layout of Apn Settings screen
Amith Yamasani [Thu, 21 Aug 2014 20:51:44 +0000 (20:51 +0000)]
Merge "Fix layout of Apn Settings screen" into lmp-dev
Amith Yamasani [Thu, 21 Aug 2014 20:30:35 +0000 (13:30 -0700)]
Fix layout of Apn Settings screen
Bug:
14081992
Change-Id: I64c458e1585d469434efafd942876f64508723a1
Kenny Guy [Thu, 21 Aug 2014 17:57:32 +0000 (17:57 +0000)]
am
66b0d9e8: Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev
* commit '
66b0d9e809a67689daf9b060e5464b4cc196169f':
Disable non-permitted accessibility services and IMEs
Kenny Guy [Thu, 21 Aug 2014 17:44:24 +0000 (17:44 +0000)]
Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev
Diego Pontoriero [Thu, 21 Aug 2014 16:41:56 +0000 (16:41 +0000)]
am
dbfd04d8: Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC." into lmp-dev
* commit '
dbfd04d80abb4bb605ebd517d52137108cc24d6d':
Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC.
Diego Pontoriero [Thu, 21 Aug 2014 16:34:37 +0000 (16:34 +0000)]
Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for determining carrier app instead of MCC/MNC." into lmp-dev
PauloftheWest [Thu, 21 Aug 2014 16:31:05 +0000 (16:31 +0000)]
am
98f61b71: Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev
* commit '
98f61b71ac182d87256ea21e770b57c1168d1472':
Fixed a crash when sharing video through Bluetooth.
PauloftheWest [Thu, 21 Aug 2014 16:24:10 +0000 (16:24 +0000)]
Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev
Kenny Guy [Thu, 21 Aug 2014 12:20:21 +0000 (13:20 +0100)]
Disable non-permitted accessibility services and IMEs
Bug:
14469005
Change-Id: I4986f035318854c27ecb92bbe2f0c977d53b6361
PauloftheWest [Wed, 20 Aug 2014 22:10:56 +0000 (15:10 -0700)]
Fixed a crash when sharing video through Bluetooth.
+ Fixed an issue where Settings would crash when the user tries to share a
youtube video through Bluetooth and rotates the screen.
Bug:
17023413
Change-Id: Ied284da736cf9bfc7424982a516c8305c700dd0b
vandwalle [Thu, 21 Aug 2014 15:02:24 +0000 (15:02 +0000)]
am
10673f1a: Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev
* commit '
10673f1a1e330cf20ddab04fbc09cce3f18d111d':
rename ScanResult.status -> autoJoinStatus
vandwalle [Thu, 21 Aug 2014 14:55:45 +0000 (14:55 +0000)]
Merge "rename ScanResult.status -> autoJoinStatus" into lmp-dev
Alexandra Gherghina [Thu, 21 Aug 2014 11:35:31 +0000 (12:35 +0100)]
Modify Spinner so that the arrow is closer to the text
Bug:
17137945
Change-Id: I0769b030669a7a57e0be1c03f987bcd1e0f774ca
Jessica Hummel [Thu, 21 Aug 2014 11:35:04 +0000 (11:35 +0000)]
am
ff2da2cd: Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev
* commit '
ff2da2cdb332be35bc94e3e66a10d55fe7bb0105':
Make string for work profile consistent with provisioning and framework strings.
Jessica Hummel [Thu, 21 Aug 2014 11:28:23 +0000 (11:28 +0000)]
Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev
Tadashi G. Takaoka [Thu, 21 Aug 2014 04:15:26 +0000 (04:15 +0000)]
am
fe3794a9: Remove "Choose Keyboards" settings
* commit '
fe3794a9372d643afe8cd6d8e70ec4f9e1b47a48':
Remove "Choose Keyboards" settings
Maurice Lam [Thu, 21 Aug 2014 03:34:07 +0000 (20:34 -0700)]
[WifiSetup] Tablet portrait layout
Bug:
17134016
Change-Id: I376797ceeeb467af52f6e0a2e45ad6e2523c7b26
Tadashi G. Takaoka [Thu, 21 Aug 2014 02:41:57 +0000 (11:41 +0900)]
Remove "Choose Keyboards" settings
Bug:
17109233
Change-Id: Ia3860b12238d9d2233dc270e37a055a9a411b037
Jeff Davidson [Thu, 21 Aug 2014 00:56:07 +0000 (00:56 +0000)]
am
8a983e43: Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev
* commit '
8a983e438bbc0e851471b9d58f44778584a67075':
Suppress WiFi Assistant card until future platform updates.
Jeff Davidson [Thu, 21 Aug 2014 00:09:47 +0000 (00:09 +0000)]
am
4e064343: Merge "Less intrusive VPN dialog." into lmp-dev
* commit '
4e064343b35cfa6a7615e453c1f6bcf96397e414':
Less intrusive VPN dialog.
Diego Pontoriero [Tue, 12 Aug 2014 01:25:51 +0000 (18:25 -0700)]
Change CARRIER_SETUP hook in WirelessSettings to use aeroshell
for determining carrier app instead of MCC/MNC.
Related WirelessSettings change: http://ag/374330
Related Aeroshell change to SetupWizard: http://ag/520857
Bug:
16457806
Change-Id: I60277b27e9e205041eb3969a110a57da0fb62023
PauloftheWest [Wed, 20 Aug 2014 22:10:17 +0000 (22:10 +0000)]
am
e847e7ef: Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-dev
* commit '
e847e7ef56561bf7ac824d4e5aa742be08f92624':
Added a default Bluetooth icon for Bluetooth Preferences.
Jeff Davidson [Wed, 20 Aug 2014 23:59:30 +0000 (23:59 +0000)]
Merge "Less intrusive VPN dialog." into lmp-dev
PauloftheWest [Wed, 20 Aug 2014 21:56:55 +0000 (21:56 +0000)]
Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-dev
PauloftheWest [Wed, 20 Aug 2014 21:46:37 +0000 (14:46 -0700)]
Added a default Bluetooth icon for Bluetooth Preferences.
Bug:
17139683
Change-Id: I7b68950685732a85319a0dca7bd77234d345dbb7
PauloftheWest [Wed, 20 Aug 2014 21:17:34 +0000 (21:17 +0000)]
am
d251fba2: Merge "Fixed a Bluetooth Scanning issue." into lmp-dev
* commit '
d251fba2fe308ea6aa18002c92506fca9d53848d':
Fixed a Bluetooth Scanning issue.
vandwalle [Wed, 20 Aug 2014 21:10:27 +0000 (14:10 -0700)]
rename ScanResult.status -> autoJoinStatus
This CL is dependent on Id9411c8097337b37ac1ce1a6ac8b28b4bda31ff3
Change-Id: Iec1a1e4718530f149051bd5de5235f0e0e4a438d
Amith Yamasani [Wed, 20 Aug 2014 21:08:26 +0000 (21:08 +0000)]
am
23d8742d: Merge "Update string for profile owner addition warning" into lmp-dev
* commit '
23d8742df6719f3f20545fc345b9f1cc74c6165a':
Update string for profile owner addition warning
Jeff Davidson [Thu, 21 Aug 2014 00:47:29 +0000 (00:47 +0000)]
Merge "Suppress WiFi Assistant card until future platform updates." into lmp-dev
PauloftheWest [Wed, 20 Aug 2014 20:12:08 +0000 (20:12 +0000)]
am
2dc11d40: Merge "Fixed a Settings dialog crash." into lmp-dev
* commit '
2dc11d40c205432774d4e4bc7ce56407b99eaa3a':
Fixed a Settings dialog crash.
John Spurlock [Wed, 20 Aug 2014 19:53:04 +0000 (19:53 +0000)]
am
dc79528b: Merge "Settings: Remove needless dialogTitle attribute." into lmp-dev
* commit '
dc79528bf660b9e431141e93a8c1c378af337b7a':
Settings: Remove needless dialogTitle attribute.
Amith Yamasani [Wed, 20 Aug 2014 20:58:45 +0000 (20:58 +0000)]
Merge "Update string for profile owner addition warning" into lmp-dev
Amith Yamasani [Wed, 20 Aug 2014 20:43:13 +0000 (13:43 -0700)]
Update string for profile owner addition warning
Bug:
16207721
Change-Id: I561e0fc992f19339ab794dd7dffb9d650da141a0
Jon Miranda [Wed, 20 Aug 2014 15:30:30 +0000 (15:30 +0000)]
am
735219be: Merge "Added a developer option to save attribute data." into lmp-dev
* commit '
735219be8f85bd1ad41ab91834e5a427bb2ae7fc':
Added a developer option to save attribute data.
Jessica Hummel [Wed, 20 Aug 2014 08:18:24 +0000 (09:18 +0100)]
Make string for work profile consistent with provisioning and framework strings.
Change-Id: Id52937400a2664d25b40649767df5b6723886871
bug:
16468412
Jeff Brown [Wed, 20 Aug 2014 03:19:32 +0000 (03:19 +0000)]
am
ff0e81eb: Declare CAST_SETTINGS activity.
* commit '
ff0e81eb099dd7fe15c1d444e89a992b0f020a47':
Declare CAST_SETTINGS activity.
Jeff Brown [Wed, 20 Aug 2014 00:47:54 +0000 (17:47 -0700)]
Declare CAST_SETTINGS activity.
Currently this is the same as the WIFI_DISPLAY_SETTINGS activity
although we may eventually split them apart.
Change-Id: I4c4482792abc3d3d22fb50ee9657b536374a618f
Maurice Lam [Wed, 20 Aug 2014 02:22:21 +0000 (02:22 +0000)]
am
e62de59b: Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev
* commit '
e62de59b947144ded046778b4f4ea0cc4bba12df':
[WifiSetup] Change illustration aspect ratio
Jon Miranda [Wed, 20 Aug 2014 15:24:32 +0000 (15:24 +0000)]
Merge "Added a developer option to save attribute data." into lmp-dev
Maurice Lam [Wed, 20 Aug 2014 01:59:43 +0000 (01:59 +0000)]
Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev
Alan Viverette [Wed, 20 Aug 2014 00:47:11 +0000 (00:47 +0000)]
am
aaa066b6: Add "experimental" subtitle to color correction and inversion
* commit '
aaa066b66d4c8acf8931e624cf81376ac35d358e':
Add "experimental" subtitle to color correction and inversion
OSDN Git Service
