Tadashi G. Takaoka
0bb12c257d
am f52c325f: am 666ff86d: am 935f97cd: Merge "Show "up navigate" icon in input method subtype enabler" into lmp-dev
...
* commit 'f52c325f38868816da8b61d282d6f9d35146b775':
Show "up navigate" icon in input method subtype enabler
2014-07-28 02:47:10 +00:00
Tadashi G. Takaoka
f52c325f38
am 666ff86d: am 935f97cd: Merge "Show "up navigate" icon in input method subtype enabler" into lmp-dev
...
* commit '666ff86d85e1932a16924614eeeb2cbd7d5297e4':
Show "up navigate" icon in input method subtype enabler
2014-07-28 02:43:11 +00:00
Tadashi G. Takaoka
666ff86d85
am 935f97cd: Merge "Show "up navigate" icon in input method subtype enabler" into lmp-dev
...
* commit '935f97cd9bc38fefc5b3358a2151440b85c54c32':
Show "up navigate" icon in input method subtype enabler
2014-07-28 02:39:53 +00:00
Amith Yamasani
af25bacd53
am 6b913056: am 5573c5e3: am bed3a7b6: Merge "Increase string lengths for translation" into lmp-dev
...
* commit '6b9130569af25d3ada71dc8268b21c15e62ee2d4':
Increase string lengths for translation
2014-07-27 11:49:14 +00:00
Amith Yamasani
6b9130569a
am 5573c5e3: am bed3a7b6: Merge "Increase string lengths for translation" into lmp-dev
...
* commit '5573c5e3cd11c9347096be9299bcf5b54e0121ae':
Increase string lengths for translation
2014-07-27 11:43:34 +00:00
Amith Yamasani
5573c5e3cd
am bed3a7b6: Merge "Increase string lengths for translation" into lmp-dev
...
* commit 'bed3a7b6aa64a82504057a10a1c38a82feffcc38':
Increase string lengths for translation
2014-07-27 11:30:12 +00:00
Amith Yamasani
fbd4da78ec
am b92d97ed: am ee4e67aa: am 1a77577d: Change tablet to device so it doesn\'t say tablet on a phone
...
* commit 'b92d97ed8fcdf66b0276e9f5b74cba1f4837659b':
Change tablet to device so it doesn't say tablet on a phone
2014-07-27 00:04:02 +00:00
Amith Yamasani
b92d97ed8f
am ee4e67aa: am 1a77577d: Change tablet to device so it doesn\'t say tablet on a phone
...
* commit 'ee4e67aa278d2688c42bd8e389311930dbeb3cef':
Change tablet to device so it doesn't say tablet on a phone
2014-07-26 23:59:38 +00:00
Amith Yamasani
ee4e67aa27
am 1a77577d: Change tablet to device so it doesn\'t say tablet on a phone
...
* commit '1a77577da755b0921a3b77fc66ff9b99b50b59f6':
Change tablet to device so it doesn't say tablet on a phone
2014-07-26 23:57:25 +00:00
Amith Yamasani
1a77577da7
Change tablet to device so it doesn't say tablet on a phone
...
Bug: 16447351
Change-Id: I3d10e1e1546602c4155de70650e6f9ee582fe552
2014-07-26 16:47:00 -07:00
Amith Yamasani
1d54c06a24
am de2ead8f: am 44a0acfc: am 247520c3: More User Settings improvements
...
* commit 'de2ead8f67c0b7f6f053e428044b0862baeae75e':
More User Settings improvements
2014-07-26 14:22:32 +00:00
Amith Yamasani
de2ead8f67
am 44a0acfc: am 247520c3: More User Settings improvements
...
* commit '44a0acfcb63a9b148af669b8e396ceb26a62c3e3':
More User Settings improvements
2014-07-26 14:19:17 +00:00
Amith Yamasani
44a0acfcb6
am 247520c3: More User Settings improvements
...
* commit '247520c369370885a1c085e53ee679dce0fd55ce':
More User Settings improvements
2014-07-26 14:16:15 +00:00
Amith Yamasani
247520c369
More User Settings improvements
...
Add a menu checkbox to allow creation of users from lockscreen.
Add a delete icon in restricted profiles settings.
Other little fixes to icons.
Update some strings based on feedback.
Bug: 15761405
Bug: 16550371
Bug: 16298824
Change-Id: Ib876bd57f15c6ce2d71856f72571c6b8b0e3102d
2014-07-26 14:09:43 +00:00
Maurice Lam
5fe72e8794
am 1302924b: am a078fe78: am 2d4d9a90: [WifiSetup] Don\'t show WiFi assistant card in WifiPickerActivity
...
* commit '1302924b63d507c77709bfd151e2d352915edf95':
[WifiSetup] Don't show WiFi assistant card in WifiPickerActivity
2014-07-26 01:59:10 +00:00
Maurice Lam
1302924b63
am a078fe78: am 2d4d9a90: [WifiSetup] Don\'t show WiFi assistant card in WifiPickerActivity
...
* commit 'a078fe784244434bfe34cfab97c7939877ce5766':
[WifiSetup] Don't show WiFi assistant card in WifiPickerActivity
2014-07-26 01:56:52 +00:00
Maurice Lam
a078fe7842
am 2d4d9a90: [WifiSetup] Don\'t show WiFi assistant card in WifiPickerActivity
...
* commit '2d4d9a9067a2904ed75247f83b0f37a086a020b2':
[WifiSetup] Don't show WiFi assistant card in WifiPickerActivity
2014-07-26 01:49:37 +00:00
Maurice Lam
2d4d9a9067
[WifiSetup] Don't show WiFi assistant card in WifiPickerActivity
...
Do not create the assistant card if we are in WifiPickerActivity,
which includes setup wizard and account login.
Bug: 16382431
Change-Id: Id5eaa8040eafe5222e1a5c9276a2a10bedebfd71
2014-07-25 17:55:49 -07:00
Fabrice Di Meglio
be192f46ad
am 6cab1e82: am 2799e639: am 096c0c46: Merge "Implement #15841213 Search - index Developer Option only and only if they have been activated" into lmp-dev
...
* commit '6cab1e826cf8e2d27142e1afa45b3bc376ff8fde':
Implement #15841213 Search - index Developer Option only and only if they have been activated
2014-07-25 23:59:11 +00:00
Fabrice Di Meglio
6cab1e826c
am 2799e639: am 096c0c46: Merge "Implement #15841213 Search - index Developer Option only and only if they have been activated" into lmp-dev
...
* commit '2799e6394c0fd0b19af26b57eb579a3d393bd8f8':
Implement #15841213 Search - index Developer Option only and only if they have been activated
2014-07-25 23:54:41 +00:00
Fabrice Di Meglio
2799e6394c
am 096c0c46: Merge "Implement #15841213 Search - index Developer Option only and only if they have been activated" into lmp-dev
...
* commit '096c0c46fb8cbdfeb05cdfb19d8c98b06403a18d':
Implement #15841213 Search - index Developer Option only and only if they have been activated
2014-07-25 23:49:24 +00:00
Amith Yamasani
bed3a7b6aa
Merge "Increase string lengths for translation" into lmp-dev
2014-07-25 21:16:23 +00:00
Amith Yamasani
1a4c1b080c
Increase string lengths for translation
...
Bug: 16062154
Change-Id: Ib0086f23283f324a18f71ec5f8bab9275567c59f
2014-07-26 22:54:40 -07:00
Fabrice Di Meglio
9b38520b9b
am c973fab0: am 68bf583d: am a6dbeae6: Merge "Fix bug #16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen" into lmp-dev
...
* commit 'c973fab0ca5f3ec90a2711c5424212e39f016d95':
Fix bug #16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen
2014-07-25 20:25:43 +00:00
Fabrice Di Meglio
c973fab0ca
am 68bf583d: am a6dbeae6: Merge "Fix bug #16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen" into lmp-dev
...
* commit '68bf583d86aef6caed512ad7720f142e6284ed81':
Fix bug #16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen
2014-07-25 20:21:07 +00:00
Fabrice Di Meglio
68bf583d86
am a6dbeae6: Merge "Fix bug #16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen" into lmp-dev
...
* commit 'a6dbeae65f3c7e924adf5027469064660ba9e825':
Fix bug #16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen
2014-07-25 20:17:20 +00:00
Alan Viverette
29850a82d0
am ab01ab4c: am 869d18af: am 06363397: Remove -opia color correction modes
...
* commit 'ab01ab4c4df86c8106f7806c9afde8e2c5ae92bc':
Remove -opia color correction modes
2014-07-25 19:54:21 +00:00
Alan Viverette
ab01ab4c4d
am 869d18af: am 06363397: Remove -opia color correction modes
...
* commit '869d18af2d0472f014513a2e2570c1e989bfac38':
Remove -opia color correction modes
2014-07-25 19:50:50 +00:00
Alan Viverette
869d18af2d
am 06363397: Remove -opia color correction modes
...
* commit '063633971283a2dd342fc032d3cef65d03de0125':
Remove -opia color correction modes
2014-07-25 19:46:56 +00:00
Alan Viverette
0636339712
Remove -opia color correction modes
...
The implementations for these are identical to -omaly modes.
Change-Id: Iad67c01d17c6167c530879fa29178ba63a8b876b
2014-07-25 19:41:04 +00:00
Paul Lawrence
d8e4b338e4
am 72c677c4: am 54579a9e: am 0ee45d5b: Fix Trusted Credentials layout
...
* commit '72c677c4590b098bf53b3d319fa4d007b5affb76':
Fix Trusted Credentials layout
2014-07-25 19:25:38 +00:00
Fabrice Di Meglio
4c7a058cf3
am d950abe9: am 83ce7d83: am dec81120: Merge "Enforce the presence of the Indexable interface for Indexing" into lmp-dev
...
* commit 'd950abe968b6d6a629b61f0bdb95373aaff65383':
Enforce the presence of the Indexable interface for Indexing
2014-07-25 19:25:37 +00:00
Paul Lawrence
72c677c459
am 54579a9e: am 0ee45d5b: Fix Trusted Credentials layout
...
* commit '54579a9ef347f8948c86719f459c8b330f81d670':
Fix Trusted Credentials layout
2014-07-25 19:18:41 +00:00
Fabrice Di Meglio
d950abe968
am 83ce7d83: am dec81120: Merge "Enforce the presence of the Indexable interface for Indexing" into lmp-dev
...
* commit '83ce7d83c1308811086b187eaea1558f5bd6152a':
Enforce the presence of the Indexable interface for Indexing
2014-07-25 19:18:40 +00:00
Paul Lawrence
54579a9ef3
am 0ee45d5b: Fix Trusted Credentials layout
...
* commit '0ee45d5bdc559ba7746dc803429268e8b6dd2092':
Fix Trusted Credentials layout
2014-07-25 18:47:41 +00:00
Fabrice Di Meglio
83ce7d83c1
am dec81120: Merge "Enforce the presence of the Indexable interface for Indexing" into lmp-dev
...
* commit 'dec811201f079a48e357f99532996b42406fd5af':
Enforce the presence of the Indexable interface for Indexing
2014-07-25 18:47:40 +00:00
Paul Lawrence
0ee45d5bdc
Fix Trusted Credentials layout
...
Now matches security layout. Tested on Volantis and Hammerhead in portrait
and landscape
Bug: 16381087
Change-Id: If7049f6cd241df360d9fb608e1e7e5d45e3d1d54
2014-07-25 18:20:52 +00:00
Amith Yamasani
17f51beb7a
am adbc1d32: am c5a80a98: am 2d578ce2: Don\'t use the profile info for name
...
* commit 'adbc1d32652fa3d496f6061e302ed0818f5eb1ac':
Don't use the profile info for name
2014-07-25 17:12:43 +00:00
Amith Yamasani
adbc1d3265
am c5a80a98: am 2d578ce2: Don\'t use the profile info for name
...
* commit 'c5a80a987d5f5d5b8efa2e51179f45c272a738de':
Don't use the profile info for name
2014-07-25 16:50:56 +00:00
Amith Yamasani
c5a80a987d
am 2d578ce2: Don\'t use the profile info for name
...
* commit '2d578ce29391dc72fde7330ff9ff909347ec531b':
Don't use the profile info for name
2014-07-25 16:46:48 +00:00
Amith Yamasani
2d578ce293
Don't use the profile info for name
...
Since we now have a way to directly edit the user's photo/name
via a dialog, don't rely on the Me profile name anymore. That
one will be out of sync with the manual nickname editing.
Bug: 15761405
Change-Id: Ia16c43ddcfd47894b2d2e049802d7de153ea5b94
2014-07-25 09:37:33 -07:00
Fabrice Di Meglio
a1e01f0e41
am b666f1fd: am 48aad314: am 8610ff9e: Merge "Fix Preferences background color" into lmp-dev
...
* commit 'b666f1fd9062c64b8294bcd19d19e2ff7b0a17e5':
Fix Preferences background color
2014-07-25 03:11:26 +00:00
Fabrice Di Meglio
b666f1fd90
am 48aad314: am 8610ff9e: Merge "Fix Preferences background color" into lmp-dev
...
* commit '48aad314577d650a27d5d2c45b570f0845d889d9':
Fix Preferences background color
2014-07-25 03:07:18 +00:00
Fabrice Di Meglio
48aad31457
am 8610ff9e: Merge "Fix Preferences background color" into lmp-dev
...
* commit '8610ff9ea678201920bf6fb7d3a2b141226f6640':
Fix Preferences background color
2014-07-25 03:03:43 +00:00
Fabrice Di Meglio
71827c78ec
am b0abf33f: am a757b61e: am a8469d28: Merge "More fixes for QuickLaunchSettings" into lmp-dev
...
* commit 'b0abf33f6cf617e5854dd801406bc98df4766eb0':
More fixes for QuickLaunchSettings
2014-07-24 23:41:33 +00:00
Amith Yamasani
409fbb738b
am 4069869e: am 156d1827: am ee398747: Refactor User Profile editor dialog for reuse
...
* commit '4069869e2cedefe0778af812cba760124445aada':
Refactor User Profile editor dialog for reuse
2014-07-24 23:41:33 +00:00
rich cannings
adc92594d4
am c642e3d9: am 0ed8633f: am b8684d57: Remove "Verify apps" from Security settings
...
* commit 'c642e3d915ba649702bddd9b6fe60d9210d0ccd0':
Remove "Verify apps" from Security settings
2014-07-24 23:41:32 +00:00
Baligh Uddin
4ad7fa45e4
am 30765f49: (-s ours) am c8f4e83d: (-s ours) am c3bd8097: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '30765f497de684d72287fd26e1cc9696f8ac9617':
Import translations. DO NOT MERGE
2014-07-24 23:41:31 +00:00
Paul Lawrence
5a67abbbdd
am a6ce40f4: am 4ea43465: am 832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev
...
* commit 'a6ce40f461672fdbfef611bfcc90a7578b18b70c':
Show countdown of remaining decrypt attempts before wiping device
2014-07-24 23:41:30 +00:00
Fabrice Di Meglio
479f70cd02
am c79ba3b8: am 997e93cc: am 6cef9d23: Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev
...
* commit 'c79ba3b870048e9e0fd57a232bf5de71615735cd':
Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS
2014-07-24 23:41:29 +00:00