Commit Graph

2983 Commits

Author SHA1 Message Date
John Wang
b0b45c02ec Display FCC id for LTE in Settings.
If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID.

bug:4965501
Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
2012-07-11 16:50:32 -07:00
Irfan Sheriff
5cf05f1081 am 7c8363eb: am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"
* commit '7c8363eb11b61f712e982b161a2267c2731df6fa':
  wifi: update text displayed during hotspot on/off
2012-07-03 12:23:21 -07:00
Irfan Sheriff
7c8363eb11 am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"
* commit 'd80ff0a4d615bd6f037483bf9dc2b10887d9507f':
  wifi: update text displayed during hotspot on/off
2012-07-03 12:18:33 -07:00
Irfan Sheriff
d80ff0a4d6 Merge "wifi: update text displayed during hotspot on/off" 2012-07-03 11:30:05 -07:00
Jake Hamby
9cc7ca2996 resolved conflicts for merge of 8f12b128 to master
Change-Id: I35552dafc1fc7f128726504ea97b5c3e446ac0df
2012-06-25 18:14:06 -07:00
Jake Hamby
8f12b1287f am f59dd9d6: Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev
* commit 'f59dd9d67e269a81c684ecd641e514aba8d2330a':
  Add menu item to Settings to go to Cell Broadcast settings.
2012-06-25 16:21:18 -07:00
Jake Hamby
ef57ed71bf Add menu item to Settings to go to Cell Broadcast settings.
Add menu item to Settings when "config_cellBroadcastAppLinks"
config option is set to true to jump to the Cell Broadcast app
settings activity. This enables the Cell Broadcast launcher
icon to be removed, while still allowing access to the app
(by adding a similar menu item to the MMS app) and its settings
activity (this settings link).

The menu item will not be added if the CellBroadcastReceiver
package is disabled or not installed.

Bug: 6709985
Change-Id: If3a3016ceea70704790964c0b712c31cb38f7b62
2012-06-25 13:20:45 -07:00
Christopher Tate
90b3a16911 am 1b4a9b41: am 5739d4fe: Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
* commit '1b4a9b4107c1d6ba5b2ecf5657865acc24a28686':
  Use string resources instead of literals for backup password confirmations
2012-06-19 16:36:24 -07:00
Christopher Tate
1b4a9b4107 am 5739d4fe: Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
* commit '5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f':
  Use string resources instead of literals for backup password confirmations
2012-06-19 16:34:01 -07:00
Christopher Tate
2d6497d2d1 Use string resources instead of literals for backup password confirmations
Localizability is good.  Bug 6683158

Change-Id: I205e4a09f5137e18d4085fcc041fae86f26ab188
2012-06-19 16:22:55 -07:00
Dianne Hackborn
29c749b653 am 2027328c: am 4d8dac07: Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev
* commit '2027328c7bca44ff6a0dc8c2ff64a8af052f4ea2':
  Implement issue #6633077: Improve permissions display for...
2012-06-18 10:52:33 -07:00
Dianne Hackborn
2027328c7b am 4d8dac07: Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev
* commit '4d8dac0792ec7994f9f4cbf2648cf8f3185876ca':
  Implement issue #6633077: Improve permissions display for...
2012-06-18 10:33:07 -07:00
Dianne Hackborn
e458832c76 Implement issue #6633077: Improve permissions display for...
...inherited permissions from shared UIDs

Bug: 6633077
Change-Id: I91917339e83b79a3dfcfcb70a68d571c9a7f7e14
2012-06-15 11:00:17 -07:00
Jeff Sharkey
df7375cb03 am c35b51f3: am cd4428ce: Storage banner when device in low disk state.
* commit 'c35b51f3c7746c29672d15e1564b04103c8d32bf':
  Storage banner when device in low disk state.
2012-06-12 18:57:04 -07:00
Jeff Sharkey
c35b51f3c7 am cd4428ce: Storage banner when device in low disk state.
* commit 'cd4428ce2c03fd355a3093fad6553636da9cef9b':
  Storage banner when device in low disk state.
2012-06-12 18:54:49 -07:00
Jeff Sharkey
cd4428ce2c Storage banner when device in low disk state.
Bug: 6576409
Change-Id: I25f71935e312bf6efa832d10c22e3edbdc18f4fb
2012-06-12 18:41:51 -07:00
Amith Yamasani
48fa857c92 UI to add a photo to a user's profile.
Photo will be shown in user management screen and switcher.

Change-Id: Icc0a39487daae13530fc1741780fb42fee0dada4
2012-06-12 18:18:40 -07:00
Jean-Baptiste Queru
2a074a10e0 am 3e8035bc: am c56b0146: Merge "Fixing pin_too_short text"
* commit '3e8035bcaff67d395481e3fb70ca2ad1d21cd3b5':
  Fixing pin_too_short text
2012-06-11 12:06:30 -07:00
Jean-Baptiste Queru
3e8035bcaf am c56b0146: Merge "Fixing pin_too_short text"
* commit 'c56b01460e7c83c8a21b02f411572ee69b755892':
  Fixing pin_too_short text
2012-06-11 12:03:59 -07:00
Youness Ghanim
532b11b481 Fixing pin_too_short text
Made lockpassword_pin_too_short in sync with other pin
text lables.

Change-Id: Ia9295f7b36b29a3b4370e04461446a1428fc2ee2
2012-06-11 13:45:20 +02:00
Eric Fischer
4e1e07c3f7 am 32f94d01: am 1e7fa779: Add ID to copy translation from to string that is not translated yet.
* commit '32f94d0160b246978b1201aca8920a926d733ba2':
  Add ID to copy translation from to string that is not translated yet.
2012-06-08 15:35:44 -07:00
Eric Fischer
1e7fa779f9 Add ID to copy translation from to string that is not translated yet.
Change-Id: If2fcdeb8ea6fb10a5abb04f3f5e654c03332bd2e
2012-06-08 15:06:30 -07:00
Danielle Millett
238be5dcdd am 59c2ca56: am acd37771: Merge "Removing head turn and putting blink back" into jb-dev
* commit '59c2ca56cc0112d89f663337bbec1578a3bb543f':
  Removing head turn and putting blink back
2012-06-08 14:21:49 -07:00
Danielle Millett
acd3777184 Merge "Removing head turn and putting blink back" into jb-dev 2012-06-08 14:18:05 -07:00
Danielle Millett
4a3e40d68e Removing head turn and putting blink back
Changing the strings and workflow in settings to be blink again
instead of the new head turn.  This basically undoes the following
two cls: I67c8acd4 and Ifc7b6e18.

Change-Id: I8694b1d82efac9d2f97c29128da6698b6ac2a4ce
2012-06-08 16:49:29 -04:00
Amith Yamasani
b2c24e3dac am 6f5fe4d6: am ffa6f6e3: Merge "Add back a SYNC_SETTINGS screen" into jb-dev
* commit '6f5fe4d685b796328ec40066aa610c9a4ca72f5e':
  Add back a SYNC_SETTINGS screen
2012-06-07 11:11:18 -07:00
Amith Yamasani
ffa6f6e3e2 Merge "Add back a SYNC_SETTINGS screen" into jb-dev 2012-06-07 11:06:10 -07:00
Amith Yamasani
86708a8a6d Add back a SYNC_SETTINGS screen
Revive the old Accounts&Sync screen as a dialog with the auto-sync
checkbox and a list of accounts. This will be launched when Apps
request a SYNC_SETTINGS page for controlling account and master sync.

Auto-sync data checkbox will also continue to exist in Data Usage.

Minor fixes to account list and account update monitoring.

Bug: 6614013
Bug: 6622995
Bug: 6610247
Change-Id: I35c0919a29c6bc7e5edf64f2734a3ef4f5ae5e7a
2012-06-06 20:55:40 -07:00
Philip Milne
9b059a10c7 am 0884f403: am ceb1ff2a: Merge "Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"" into jb-dev
* commit '0884f4030367eaad14cbd8114c88624286cb4cfe':
  Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"
2012-06-06 17:39:25 -07:00
Philip Milne
c00b4f29de Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"
Change-Id: I702b0d86c33b49854df5a65b398891183c3212cf
2012-06-06 14:41:28 -07:00
Jeff Brown
a95fd26fe3 am ebd1a3c5: am 977ff542: Merge "Revert "Rename and flip meaning of auto-rotate to rotation lock."" into jb-dev
* commit 'ebd1a3c5deca5953f4a7b31f325ab7888f88d620':
  Revert "Rename and flip meaning of auto-rotate to rotation lock."
2012-06-05 19:24:47 -07:00
Jeff Brown
977ff5426d Merge "Revert "Rename and flip meaning of auto-rotate to rotation lock."" into jb-dev 2012-06-05 19:11:32 -07:00
Jeff Brown
56c58d5aef Revert "Rename and flip meaning of auto-rotate to rotation lock."
Bug: 6523269
This reverts commit b944171092.
2012-06-05 17:45:07 -07:00
Andrew Flynn
758ce006e5 am ab88256f: am ab049a19: Increase dimens for power control widget for sw600dp
* commit 'ab88256fd2f2c36c4595a5e36d6cc07383ce5935':
  Increase dimens for power control widget for sw600dp
2012-06-05 15:04:49 -07:00
Andrew Flynn
ab049a196b Increase dimens for power control widget for sw600dp
Bug: 6527125
Change-Id: If4c3dad24e8fc70ca76bb551cfd9e32be96a6337
2012-06-05 14:58:24 -07:00
Amith Yamasani
495c46b4ce am 227edcf6: am 03295520: Merge "Account types at toplevel of Settings" into jb-dev
* commit '227edcf61abaf91001d9061537d66e0aad64a4ee':
  Account types at toplevel of Settings
2012-06-05 09:21:32 -07:00
Amith Yamasani
d1ab82807a Account types at toplevel of Settings
Reorganized Account settings to show account types at the top-level
of Settings. Only account types that have accounts added are visible
here. There is an Add account button to add a new account.

Master sync toggle has moved to Data Usage screen in the overflow menu.
It shows additional detail of the function of the auto-sync toggle when
it is toggled by the user.

Account type screen (ManageAccountsSettings) shows list of accounts of
that type and any available authenticator settings. It additionally
verifies any Intents can be resolved before showing the corresponding
entry. This screen now shows last synced time for each account.

You can now sync all accounts of a type by selecting Sync now in the
Account type screen.

Account Sync screen that shows the list of syncable items has minor
tweaks:
 - "Last synced...", "Sync is OFF"
 - Doesn't show the authenticator settings here anymore.

Bug: 6579937

Change-Id: I8139a4c992b525a3e1efc24d2d223c3f5caddc76
2012-06-04 17:01:22 -07:00
Brian Colonna
44cc9bf82d am 90092277: am af197847: Merge "Bug 5457035: Changed strings in FUL anti-spoofing setup" into jb-dev
* commit '900922773a70b73d93a55da52f0b974ac89677a1':
  Bug 5457035: Changed strings in FUL anti-spoofing setup
2012-06-02 08:19:44 -07:00
Brian Colonna
af19784716 Merge "Bug 5457035: Changed strings in FUL anti-spoofing setup" into jb-dev 2012-06-01 14:45:56 -07:00
Brian Colonna
e06fb708f0 Bug 5457035: Changed strings in FUL anti-spoofing setup
Added latest string changes requested for Face Unlock
liveness/head-turn anti-spoofing option.

Change-Id: Ic703bda6b449756bdf05d7de843e9aab6b939446
2012-06-01 16:37:06 -04:00
Amith Yamasani
68f03e9ede am 31d868b3: am 040029af: Merge "Reword the summary text for Unknown sources in Security Settings" into jb-dev
* commit '31d868b37c5c48b469fdf890d8021887461c2f36':
  Reword the summary text for Unknown sources in Security Settings
2012-05-31 15:33:45 -07:00
Amith Yamasani
040029af27 Merge "Reword the summary text for Unknown sources in Security Settings" into jb-dev 2012-05-31 15:27:19 -07:00
Amith Yamasani
8f98771c5c Reword the summary text for Unknown sources in Security Settings
Don't use "non-Market" to describe unknown sources.

Bug: 6586626
Change-Id: I2ab440e9db1592ea8b398bd9466ff2f05ca5f6ce
2012-05-31 13:12:13 -07:00
Irfan Sheriff
f05811949f am 945a36f6: am 5388bc88: Merge "Fix poor network detection setting" into jb-dev
* commit '945a36f621a5406b20602dd4080fcd59f8a9950f':
  Fix poor network detection setting
2012-05-31 12:27:02 -07:00
Irfan Sheriff
5388bc88bd Merge "Fix poor network detection setting" into jb-dev 2012-05-31 12:22:30 -07:00
Irfan Sheriff
f0780a7cad Fix poor network detection setting
We used to base this on watchdog being turned on, but it should
be based on whether device is wifi only

Bug: 6576101
Change-Id: Ib5221287e6713c625d39ef986ceb278825fb4895
2012-05-31 11:15:41 -07:00
Uriel Rodriguez
5c489be89c BUG 5457035 : Anti-spoofing : DO NOT MERGE
Squashed commit of the following:

commit 060b9daf5fe3c45573a13a149bf98f4fa1e6a46f
Author: Danielle Millett <dmillett@google.com>
Date:   Wed May 30 15:50:03 2012 -0400

    Added head turn option for Face Unlock.

    In security settings there is an option for head turn and it shows the current
    status (on/off).  Clicking on this goes to another screen that describes the
    feature and allows the user to it on/off.
    Since the head turn option goes to a different screen instead of using a check box,
    this change also rips out the rest of the code for the old liveliness checkbox.

    Change-Id: I197af51084f3e751081fa159dadd6c2c80840d1e

Change-Id: I67c8acd49316b49771a0bb97b4a5fbd5a1c13262
2012-05-30 19:55:12 -04:00
Danielle Millett
d35705f1dd Added head turn option for Face Unlock.
In security settings there is an option for head turn and it shows the current
status (on/off).  Clicking on this goes to another screen that describes the
feature and allows the user to it on/off.
Since the head turn option goes to a different screen instead of using a check box,
this change also rips out the rest of the code for the old liveliness checkbox.

Change-Id: I197af51084f3e751081fa159dadd6c2c80840d1e
2012-05-30 16:56:23 -04:00
Amith Yamasani
622824ad00 am 6eddf3eb: am 8242901e: Merge "Adjust layout to avoid clipping." into jb-dev
* commit '6eddf3eb1ab28d252d49022774fc7e9fcde5f252':
  Adjust layout to avoid clipping.
2012-05-30 10:00:18 -07:00
Amith Yamasani
8242901e16 Merge "Adjust layout to avoid clipping." into jb-dev 2012-05-30 09:55:45 -07:00