PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,780 Commits 1 Branch 0 Tags
ba0ad522266eb61889bf14b51af774376b4c7ad5
Commit Graph

5780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
43509d6edf am 325d1ab1: am 340990a2: am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 
* commit '325d1ab157bccb203b526baef366f19bcd7636b0':
  Fix 4560303: Add setting to lock later when power button pressed
 2012-01-10 10:34:54 -08:00
Jim Miller
325d1ab157 am 340990a2: am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 
* commit '340990a2d29f566b83dc551e3c5f748c96bd99f2':
  Fix 4560303: Add setting to lock later when power button pressed
 2012-01-10 10:32:40 -08:00
Jim Miller
340990a2d2 am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 
* commit 'af48709993faeb0d3665eb6a491aaec701e1ccd5':
  Fix 4560303: Add setting to lock later when power button pressed
 2012-01-10 10:30:39 -08:00
Jim Miller
af48709993 Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 2012-01-10 10:28:31 -08:00
Amith Yamasani
143ad9ef19 am 201896e9: am 79ffc669: am aaff44c8: Don\'t allow wifi tethering when running monkeys. 
* commit '201896e9838c067102b5ec10f883d84e75ed276c':
  Don't allow wifi tethering when running monkeys.
 2012-01-10 09:02:55 -08:00
Amith Yamasani
201896e983 am 79ffc669: am aaff44c8: Don\'t allow wifi tethering when running monkeys. 
* commit '79ffc669173325e62fdb9f5a1f96fe2a5c3c230b':
  Don't allow wifi tethering when running monkeys.
 2012-01-09 16:37:34 -08:00
Amith Yamasani
79ffc66917 am aaff44c8: Don\'t allow wifi tethering when running monkeys. 
* commit 'aaff44c84f4e88184276064dff9e36eefde3ffcb':
  Don't allow wifi tethering when running monkeys.
 2012-01-09 16:03:30 -08:00
Amith Yamasani
aaff44c84f Don't allow wifi tethering when running monkeys. 
Bug: 5607825

Remove the wifi access point settings and wifi tethering checkbox when
monkeys are running.

Change-Id: I64b930ddb791013a08c178561fe29130f1f0e4b8
 2012-01-09 14:52:58 -08:00
Jim Miller
071742d838 Fix 4560303: Add setting to lock later when power button pressed 
This adds a feature to delay locking the device when the power button
is pressed.  This fixes a use case where the user wants to turn off
the display (e.g. to save power) but doesn't want to lock the device.

Change-Id: I711a81c3e79f7accdc1d9cb217b7806a0b8fcf63
 2012-01-09 14:25:04 -08:00
The Android Open Source Project
e002361d5d am 83b96133: am 5be1b1a2: Reconcile with ics-mr1-release 
* commit '83b9613395305653290f4236989fc60313ec93ac':
 2012-01-07 00:42:19 -08:00
The Android Open Source Project
83b9613395 am 5be1b1a2: Reconcile with ics-mr1-release 
* commit '5be1b1a29507fe0aa09c30403b989a36077de0a7':
 2012-01-06 18:18:42 -08:00
The Android Open Source Project
5be1b1a295 Reconcile with ics-mr1-release 
Change-Id: Ifa3965b3e29cc1a9fe89a24e78e83507a4b2880c
 2012-01-06 18:15:48 -08:00
The Android Automerger
b8adf8c0dc merge in ics-mr1-release history after reset to ics-mr1 2012-01-06 16:32:49 -08:00
Jean Chalard
0cf7d11ba2 am 38d658d0: Merge "Increase char limit by 1 by request from translation." 
* commit '38d658d01d357878f3eb8201a31c1f120351e605':
  Increase char limit by 1 by request from translation.
 2012-01-05 18:14:42 -08:00
Jean Chalard
38d658d01d Merge "Increase char limit by 1 by request from translation." 2012-01-05 18:12:37 -08:00
Todd Poynor
a583e3bdf0 am 6fec6e67: am dbc6b663: am da68fd46: Merge "Android OS battery usage overstated by screen on time" into ics-mr1 
* commit '6fec6e6770f9cd0cd6fa5588a210703e49407de5':
  Android OS battery usage overstated by screen on time
 2012-01-05 12:13:15 -08:00
Todd Poynor
6fec6e6770 am dbc6b663: am da68fd46: Merge "Android OS battery usage overstated by screen on time" into ics-mr1 
* commit 'dbc6b663079420fd9212d2062e2a3f1c25b27f24':
  Android OS battery usage overstated by screen on time
 2012-01-05 12:09:15 -08:00
Todd Poynor
dbc6b66307 am da68fd46: Merge "Android OS battery usage overstated by screen on time" into ics-mr1 
* commit 'da68fd4620088c1cb3a51cd2064885cbcd1ac621':
  Android OS battery usage overstated by screen on time
 2012-01-05 11:23:34 -08:00
Todd Poynor
da68fd4620 Merge "Android OS battery usage overstated by screen on time" into ics-mr1 2012-01-05 11:21:08 -08:00
Todd Poynor
e3b4dfae6f Android OS battery usage overstated by screen on time 
Change-Id: Icbc4b3ecf91bdbb90da3ee0cf1c68bec953d0177
Signed-off-by: Todd Poynor <toddpoynor@google.com>
 2012-01-05 10:40:14 -08:00
Narayan Kamath
1f6b4d4a26 am 5a38df26: Call setLanguage() when the TTS locale is changed in settings. 
* commit '5a38df2648f5e8246d20a46675bd99cc5ea368e0':
  Call setLanguage() when the TTS locale is changed in settings.
 2012-01-05 07:40:33 -08:00
Narayan Kamath
5a38df2648 Call setLanguage() when the TTS locale is changed in settings. 
This is required to fix the case where an app has instantiated
and is using a TextToSpeech instance, and the user switches to
settings and changes the language for that instance. If no
app was using TTS, then onCreate() would have be called when
TTS is used next, and the correct locale will be loaded.

bug:5823836
Change-Id: I62adf3f7f0f14b67450ba08b8743e0d31e615a7e
 2012-01-05 15:14:04 +00:00
Jean Chalard
a21db60c55 Increase char limit by 1 by request from translation. 
This should still fit in the button.

Change-Id: I63c7c7d5298709e222e08fbbe2ff07638b19c7b1
 2012-01-05 19:16:49 +09:00
Vladimir Baryshnikov
aa5cb065e3 Observer for GPS is never added back. 
mSettingsObserver will be added only once  to mContentQueryMap on first start,
but if you bring activity back to top, it will not be added any more.

Signed-off-by: Vladimir Baryshnikov <vovkab@gmail.com>
 2012-01-03 18:11:42 -08:00
Svetoslav Ganov
63ad27860b AccessibilityService description not internationalized (Settings). 
bug:5807616

Change-Id: Iab6cf000ce1029ab253d56cb8abe222ad3204e6d
 2012-01-03 17:04:29 -08:00
Eric Fischer
6dfc33fea0 am c9ac3ca0: Import revised translations. 
* commit 'c9ac3ca0f198d62e16591e7867210251a853c0d1':
  Import revised translations.
 2011-12-29 15:07:07 -08:00
Eric Fischer
c9ac3ca0f1 Import revised translations. 
Change-Id: I80538778f484d7bc37fdb78947d56802cc57286b
 2011-12-29 13:36:38 -08:00
Chia-chi Yeh
2b031e8102 am 2340efc9: VpnSettings: use USER_PRIVATE_KEY to list user certificates. 
* commit '2340efc9a3fb4ae7b90cf9e7b3eab8c9ff7aeec8':
  VpnSettings: use USER_PRIVATE_KEY to list user certificates.
 2011-12-27 13:45:38 -08:00
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
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