Commit Graph

14734 Commits

Author SHA1 Message Date
Alexandra Gherghina
0d05a3145a am 3f0140ec: am 28ff0ff0: Update string displayed when we can\'t remove an account
* commit '3f0140ec4d5e305b47b5ff713aec9b1136fea1e7':
  Update string displayed when we can't remove an account
2014-07-28 14:33:34 +00:00
Alexandra Gherghina
3f0140ec4d am 28ff0ff0: Update string displayed when we can\'t remove an account
* commit '28ff0ff0f19b3ef2a665d72020509d106bf6e73f':
  Update string displayed when we can't remove an account
2014-07-28 14:29:59 +00:00
Alexandra Gherghina
28ff0ff0f1 Update string displayed when we can't remove an account
Bug: 14642886
Change-Id: Ie4a902cfd1ae41f2a1bae28432874e7b8b34b50d
2014-07-28 15:24:34 +01:00
Alexandra Gherghina
a97ee9a837 am aef3a97c: am 95b86a54: Refactoring useless UserUtils class
* commit 'aef3a97c86164e3ad343f8a6924ea5172575d68c':
  Refactoring useless UserUtils class
2014-07-28 12:09:00 +00:00
Tadashi G. Takaoka
b1567f5340 am 5f3fea65: am 72f70723: Merge "Preserve enabled subtypes across disabling and re-enabling an IME" into lmp-dev
* commit '5f3fea65721add7db4fc3790ab4accebbb886d14':
  Preserve enabled subtypes across disabling and re-enabling an IME
2014-07-28 12:09:00 +00:00
Lajos Molnar
982bc06de6 am 3e940224: am dc3bc0ba: Make nuplayer the default media player.
* commit '3e9402244e6153aaf9b2b569350ecf1d19e8996c':
  Make nuplayer the default media player.
2014-07-28 12:08:59 +00:00
Alexandra Gherghina
aef3a97c86 am 95b86a54: Refactoring useless UserUtils class
* commit '95b86a5488a27d95bda8b6db1f608d6ce55dae8a':
  Refactoring useless UserUtils class
2014-07-28 11:59:19 +00:00
Tadashi G. Takaoka
5f3fea6572 am 72f70723: Merge "Preserve enabled subtypes across disabling and re-enabling an IME" into lmp-dev
* commit '72f7072328539d58ba02a6851e9e292a750f7d20':
  Preserve enabled subtypes across disabling and re-enabling an IME
2014-07-28 11:58:59 +00:00
Lajos Molnar
3e9402244e am dc3bc0ba: Make nuplayer the default media player.
* commit 'dc3bc0ba6be006c89b9674cdcc23b3972b7b1052':
  Make nuplayer the default media player.
2014-07-28 11:58:57 +00:00
Alexandra Gherghina
95b86a5488 Refactoring useless UserUtils class
Bug: 16542609
Change-Id: Iadb83c5e378cd342ea89d6e224ddc45e6f940c8b
2014-07-28 07:40:48 +00:00
Lajos Molnar
dc3bc0ba6b Make nuplayer the default media player.
Update nuplayer settings to use awesomeplayer key.

Bug: 11784824
Change-Id: I25ec4b4bd289e3f00c3d299b1a3a5275d1ba73fe
2014-07-27 21:59:18 -07: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
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
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
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
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
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
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
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
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
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
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
b0abf33f6c am a757b61e: am a8469d28: Merge "More fixes for QuickLaunchSettings" into lmp-dev
* commit 'a757b61ec96eda097f67375621b23c797539d4dc':
  More fixes for QuickLaunchSettings
2014-07-24 23:37:14 +00:00
Amith Yamasani
4069869e2c am 156d1827: am ee398747: Refactor User Profile editor dialog for reuse
* commit '156d1827806d70060952f4d0d1752c455a7dcfbc':
  Refactor User Profile editor dialog for reuse
2014-07-24 23:37:14 +00:00
rich cannings
c642e3d915 am 0ed8633f: am b8684d57: Remove "Verify apps" from Security settings
* commit '0ed8633fed9856c5f1baa6fac322eb03934d4d72':
  Remove "Verify apps" from Security settings
2014-07-24 23:36:57 +00:00
Baligh Uddin
30765f497d am c8f4e83d: (-s ours) am c3bd8097: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'c8f4e83de27af48cef4e49fd536e9fef3374c841':
  Import translations. DO NOT MERGE
2014-07-24 23:36:02 +00:00
Paul Lawrence
a6ce40f461 am 4ea43465: am 832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev
* commit '4ea43465fa12efbe064f24d583a39409caa3cf3d':
  Show countdown of remaining decrypt attempts before wiping device
2014-07-24 23:36:02 +00:00
Fabrice Di Meglio
c79ba3b870 am 997e93cc: am 6cef9d23: Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev
* commit '997e93cca483985d31236d66023bc83e24154ba1':
  Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS
2014-07-24 23:35:32 +00:00
Adam Lesinski
44b0c71d13 am 2c276024: am 468d3916: Implement the Usage Access Settings UI
* commit '2c27602438ce8a1d39c856e834b6405aa96d3218':
  Implement the Usage Access Settings UI
2014-07-24 23:34:45 +00:00