Commit Graph

6199 Commits

Author SHA1 Message Date
Chia-chi Yeh
2340efc9a3 VpnSettings: use USER_PRIVATE_KEY to list user certificates.
Change-Id: Iba547331d00ddfe24dd5eda3a9ee70c9d17969d0
2011-12-27 13:21:57 -08:00
Irfan Sheriff
d8530ea6e4 am 029dffbd: Merge "Add debug support for P2P WPS"
* commit '029dffbd5cefa3396a7c6acc6ff9650a068923b7':
  Add debug support for P2P WPS
2011-12-21 09:28:18 -08:00
Irfan Sheriff
029dffbd5c Merge "Add debug support for P2P WPS" 2011-12-21 09:26:51 -08:00
The Android Open Source Project
bb2569b591 am e6924090: am 2c49911b: Reconcile with ics-mr1-release
* commit 'e6924090f1a787218a1e59f0077134e86233c1a9':
2011-12-21 07:23:38 -08:00
The Android Open Source Project
e6924090f1 am 2c49911b: Reconcile with ics-mr1-release
* commit '2c49911b21b275810ddcde0d2bcebf900099d02d':
2011-12-21 07:21:43 -08:00
The Android Open Source Project
2c49911b21 Reconcile with ics-mr1-release
Change-Id: I35894bf1394fd007afa6cca910b2d9ae18ffdb49
2011-12-21 07:19:46 -08:00
Jean Chalard
85039c99cb am 124283e8: Have the add dialog maintain state across screen rotation
* commit '124283e83bdbaa83e01f31ff147c0ead9ce3cc90':
  Have the add dialog maintain state across screen rotation
2011-12-21 01:02:27 -08:00
Jean Chalard
124283e83b Have the add dialog maintain state across screen rotation
Change-Id: I44d61018e0ed4de32b0a8da3ecba999831987956
2011-12-21 17:51:02 +09:00
The Android Automerger
52303c68fe merge in ics-mr1-release history after reset to ics-mr1 2011-12-20 17:27:42 -08:00
Kazuhiro Ondo
5db3b4f6f5 am 9687a8d4: am 9fb7b17c: am a98c353f: Don\'t enable SIM PIN Lock menu if SIM is not available
* commit '9687a8d4a445901f1d661d761d00005f3fcd27bb':
  Don't enable SIM PIN Lock menu if SIM is not available
2011-12-20 16:49:12 -08:00
Kazuhiro Ondo
9687a8d4a4 am 9fb7b17c: am a98c353f: Don\'t enable SIM PIN Lock menu if SIM is not available
* commit '9fb7b17c465e6cf38681ef7742ee1a0a486c5b79':
  Don't enable SIM PIN Lock menu if SIM is not available
2011-12-20 16:47:27 -08:00
Kazuhiro Ondo
9fb7b17c46 am a98c353f: Don\'t enable SIM PIN Lock menu if SIM is not available
* commit 'a98c353f8b18607f0c2e9af26b91bf6ffbe8dc78':
  Don't enable SIM PIN Lock menu if SIM is not available
2011-12-20 16:45:45 -08:00
Kazuhiro Ondo
e75ce965e3 am a98c353f: Don\'t enable SIM PIN Lock menu if SIM is not available
* commit 'a98c353f8b18607f0c2e9af26b91bf6ffbe8dc78':
  Don't enable SIM PIN Lock menu if SIM is not available
2011-12-20 16:45:41 -08:00
Kazuhiro Ondo
a98c353f8b Don't enable SIM PIN Lock menu if SIM is not available
Bug: 5774681
Change-Id: I1edd1447ff83ab8cf9e8a1eb8fbd85ef0becdce7
2011-12-20 14:30:15 -08:00
Irfan Sheriff
1e13143b3a Add debug support for P2P WPS
Use a system property to allow WPS selection for p2p
connection

Change-Id: I34af97eaa4c4d4ff2e7ed52ba8f9bfb21f7b1c45
2011-12-19 16:43:29 -08:00
Jean Chalard
2b4022a415 am b4ba0ef7: Merge "Change the "manage dictionaries" button to "less options""
* commit 'b4ba0ef7866c7154d58df5efad7f56fa8d9f22c4':
  Change the "manage dictionaries" button to "less options"
2011-12-19 01:28:20 -08:00
Jean Chalard
b4ba0ef786 Merge "Change the "manage dictionaries" button to "less options"" 2011-12-19 01:27:14 -08:00
Todd Poynor
379c07ce6c am 103b2807: Android OS battery usage overstated by screen on time
* commit '103b28073ace62fe3cca14569bc9807ed7affe88':
  Android OS battery usage overstated by screen on time
2011-12-16 18:21:15 -08:00
Todd Poynor
103b28073a Android OS battery usage overstated by screen on time
Change-Id: Icbc4b3ecf91bdbb90da3ee0cf1c68bec953d0177
Signed-off-by: Todd Poynor <toddpoynor@google.com>
2011-12-16 16:15:13 -08:00
Jean Chalard
2c892d900b Change the "manage dictionaries" button to "less options"
This is supposed to be easier to understand for users.

Change-Id: I144031941712ab15fb490619c288d533ce884ee9
2011-12-16 18:31:48 +09:00
Jean Chalard
cd15476d52 am 99308097: Improve a translation comment
* commit '99308097a1d022a12affe528d26193fb4d031a60':
  Improve a translation comment
2011-12-16 00:11:29 -08:00
Jean Chalard
99308097a1 Improve a translation comment
Change-Id: I5250a43ef2e54706c649dbb8ae80bfec9064e835
2011-12-16 16:47:12 +09:00
Jeff Sharkey
7858a09da2 am 3038c52d: Restrict app data on metered networks.
* commit '3038c52de43b73d02b501e0ea8d396bedbb5600e':
  Restrict app data on metered networks.
2011-12-15 15:39:51 -08:00
Jeff Sharkey
3038c52de4 Restrict app data on metered networks.
Paired with framework change that no longer requires NetworkPolicy
to have limit when restricting apps.

Bug: 5571454
Change-Id: I2a5d8446a9278afb183e13d0f41f436ccb3bc9e8
2011-12-15 14:03:37 -08:00
The Android Open Source Project
1a02820a7b am 459a531d: am e8b0e7d3: Reconcile with ics-mr1-release
* commit '459a531da425206ca74ca3813083687eb4acc110':
2011-12-15 10:08:02 -08:00
The Android Open Source Project
459a531da4 am e8b0e7d3: Reconcile with ics-mr1-release
* commit 'e8b0e7d3f4432284975d2fcfd80efa5d6f9b50ea':
2011-12-13 19:13:16 -08:00
The Android Open Source Project
e8b0e7d3f4 Reconcile with ics-mr1-release
Change-Id: I4d2578e9635a5585c499f7ffcd816c5cf6876b3f
2011-12-13 19:10:39 -08:00
The Android Automerger
c8c65a3b81 merge in ics-mr1-release history after reset to ics-mr1 2011-12-13 16:04:02 -08:00
Irfan Sheriff
8b2f6ea9ee am f16669a6: Merge "Fix button visibility on connect"
* commit 'f16669a6014498e191d871d85efeab936b33dfa7':
  Fix button visibility on connect
2011-12-13 14:28:53 -08:00
Eric Fischer
0bb1beed5a am f5bf1e7b: am 91420083: (-s ours) am 2bccd7f4: Import revised translations. DO NOT MERGE
* commit 'f5bf1e7b68bd57c40253abe751dc33bef1109e68':
  Import revised translations. DO NOT MERGE
2011-12-13 14:28:07 -08:00
Irfan Sheriff
f16669a601 Merge "Fix button visibility on connect" 2011-12-13 13:17:45 -08:00
Irfan Sheriff
0c0bd827a1 Fix button visibility on connect
Bug: 5750846
Change-Id: I1f31308a21f7f6876f12eb4f1ab45ecd1bc74092
2011-12-13 11:55:15 -08:00
Eric Fischer
cd6fc886ff am 2bccd7f4: Import revised translations. DO NOT MERGE
* commit '2bccd7f4a7793fd78dd9c83e9fe613ea9e32513b':
  Import revised translations. DO NOT MERGE
2011-12-13 10:52:31 -08:00
Eric Fischer
f5bf1e7b68 am 91420083: (-s ours) am 2bccd7f4: Import revised translations. DO NOT MERGE
* commit '914200831f977e69e9eb98459403c19119ff3539':
  Import revised translations. DO NOT MERGE
2011-12-13 10:21:09 -08:00
Eric Fischer
914200831f am 2bccd7f4: Import revised translations. DO NOT MERGE
* commit '2bccd7f4a7793fd78dd9c83e9fe613ea9e32513b':
  Import revised translations. DO NOT MERGE
2011-12-13 10:18:52 -08:00
Eric Fischer
2bccd7f4a7 Import revised translations. DO NOT MERGE
Change-Id: I2dddd2b4c95c27f47c2299500fc893dd6475e3fe
2011-12-13 10:04:17 -08:00
The Android Open Source Project
e7ffdd5de5 am c46de71f: am bb712edd: Reconcile with ics-mr1-release
* commit 'c46de71ff4b2613526e35ee878e359ae5c855d20':
2011-12-13 05:48:35 -08:00
Jean Chalard
128a0d9c56 am ee4c1be2: Wording fix
* commit 'ee4c1be2600c14d2f023ad89999ac5f4b4293264':
  Wording fix
2011-12-13 05:48:29 -08:00
The Android Open Source Project
c46de71ff4 am bb712edd: Reconcile with ics-mr1-release
* commit 'bb712edde58d3b4069bb7f1f63895522ce651579':
2011-12-13 05:40:55 -08:00
The Android Open Source Project
bb712edde5 Reconcile with ics-mr1-release
Change-Id: I5dadecff177d51ca1193ed0a1c69d2ed09bdba60
2011-12-13 05:12:02 -08:00
Jean Chalard
ee4c1be260 Wording fix
Bug: 5306641
Change-Id: I11c404bd5d093149f044546363245ebb50e1b195
2011-12-13 20:45:57 +09:00
The Android Automerger
5652d2fcbc merge in ics-mr1-release history after reset to ics-mr1 2011-12-12 22:09:28 -08:00
Eric Fischer
d46bcb74b7 am 71af03eb: am efbb9c5d: (-s ours) am 080691ed: Import revised translations. DO NOT MERGE
* commit '71af03eb0b87cace81f79ff04c9cf4f7bd122b44':
  Import revised translations.  DO NOT MERGE
2011-12-12 15:44:07 -08:00
Eric Fischer
71af03eb0b am efbb9c5d: (-s ours) am 080691ed: Import revised translations. DO NOT MERGE
* commit 'efbb9c5d9d56e7f9d62b32014d0361ed8a87990b':
  Import revised translations.  DO NOT MERGE
2011-12-12 15:39:21 -08:00
The Android Open Source Project
9f34f61ffd am 4bf88843: am 71ca5e4c: Reconcile with ics-mr1-release
* commit '4bf888436d7d1a961c9091a80295cfac46a8aaca':
2011-12-12 15:34:40 -08:00
The Android Open Source Project
4bf888436d am 71ca5e4c: Reconcile with ics-mr1-release
* commit '71ca5e4c62283a4adc10a77356ed98c7fb7b8647':
2011-12-12 15:30:00 -08:00
Eric Fischer
74ddfbd658 am 080691ed: Import revised translations. DO NOT MERGE
* commit '080691eda9be32e090ed9abba1cc6fa0047b51fd':
  Import revised translations.  DO NOT MERGE
2011-12-12 11:08:36 -08:00
Eric Fischer
efbb9c5d9d am 080691ed: Import revised translations. DO NOT MERGE
* commit '080691eda9be32e090ed9abba1cc6fa0047b51fd':
  Import revised translations.  DO NOT MERGE
2011-12-12 11:06:39 -08:00
Eric Fischer
080691eda9 Import revised translations. DO NOT MERGE
Change-Id: I451a0d68abfcf34dd3b601fed87111ce9c5f2aa8
2011-12-12 11:00:08 -08:00
Meng Hu
ff17dc22de am 11140b7d: am 1d015e49: am 3feacdf3: Add Sprint update menu
* commit '11140b7d63202cd346e3b0ba2ff1f4bf2843e3d7':
  Add Sprint update menu
2011-12-09 18:11:37 -08:00