Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,406 Commits 1 Branch 0 Tags
7e09be13705bad913555dedbf7fb16403bc401fb
Commit Graph

5218 Commits

Author SHA1 Message Date
Alexandra Gherghina
24d0b6cc62 am b496606d: am e5e43084: am 8ea6cbf7: am 9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev 
* commit 'b496606ddcd1d43b8791b6bbd8399cf5c13c8b7a':
  Match parent width for user spinner to fix tint
 2014-09-26 21:52:43 +00:00
Alexandra Gherghina
8ea6cbf7d9 am 9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev 
* commit '9de68440a9ae9cfadee3939c1ca461e42871f766':
  Match parent width for user spinner to fix tint
 2014-09-26 19:55:28 +00:00
Alexandra Gherghina
e4124f4743 Match parent width for user spinner to fix tint 
Bug: 17640172
Change-Id: I4cbea855cac9180d193f9ba936ec1bab81df537d
 2014-09-25 11:29:17 +01:00
Alan Viverette
f1f7af01de am 05df9029: am e4031966: am 6f6e547e: am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev 
* commit '05df9029e951816888b06599dd7320de9362f038':
  Fix background colors to point directly to theme attribute
 2014-09-24 04:13:11 +00:00
Alan Viverette
6f6e547e6a am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev 
* commit '3156e38f5ec788048439a401ea5f5012e11ea2a7':
  Fix background colors to point directly to theme attribute
 2014-09-24 01:34:44 +00:00
Alan Viverette
f81f72ffed Fix background colors to point directly to theme attribute 
BUG: 17520824
Change-Id: I77fcbc2a5535f4916053cf1668cbe2e432b2dc95
 2014-09-23 18:14:54 -07:00
John Spurlock
2c383942b3 am a7fb5fbc: am 7d085d6d: am 65a7bc64: am 7e905488: Settings: Wire up new zen events config option. 
* commit 'a7fb5fbc7b35ba905d84362582bdf67d53ad5d40':
  Settings: Wire up new zen events config option.
 2014-09-23 15:48:31 +00:00
John Spurlock
65a7bc6449 am 7e905488: Settings: Wire up new zen events config option. 
* commit '7e90548836b3e7c4ec8132d9965ba11f055f6931':
  Settings: Wire up new zen events config option.
 2014-09-22 21:21:04 +00:00
John Spurlock
7e90548836 Settings: Wire up new zen events config option. 
Add a new switch to zen mode settings for the new
events config attribute.

Depends on frameworks/base:
  Iff10df385206ad73c3423ff118c79e94a10918d9

Bug:17580878
Change-Id: Ib6c74a871aa02f9379dce58dd5bca817dcd3929a
 2014-09-22 16:45:06 -04:00
Baligh Uddin
b4d0d4da2e Import translations. DO NOT MERGE 
Change-Id: Ic065056673757eb2cc68d1102d5e480418e7cc47
Auto-generated-cl: translation import
 2014-09-20 23:34:37 -07:00
Baligh Uddin
2bfd4a5f2c Import translations. DO NOT MERGE 
Change-Id: I628b5768f52d634b8ce2a08b1fee5f07de7a8b68
Auto-generated-cl: translation import
 2014-09-20 23:24:41 -07:00
Baligh Uddin
f015d47cf5 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-19 22:34:18 +00:00
Baligh Uddin
ae7c180ad7 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-19 22:34:16 +00:00
PauloftheWest
7612e0d709 am 21afc838: am 50a53bdb: am f6526146: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit '21afc838de9cf6cc495ccba36dcbc7c014b06220':
  Removed an extraneous messge when pairing.
 2014-09-18 16:35:51 +00:00
PauloftheWest
50a53bdbe3 am f6526146: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit 'f6526146250ff68df0f8941fe0b91ae74d55ab8d':
  Removed an extraneous messge when pairing.
 2014-09-18 16:11:54 +00:00
PauloftheWest
f652614625 am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit '0f01eeff84ebdb93f24398d3adb5f214ae1ce2bb':
  Removed an extraneous messge when pairing.
 2014-09-18 16:01:15 +00:00
PauloftheWest
0f01eeff84 Merge "Removed an extraneous messge when pairing." into lmp-dev 2014-09-18 15:51:50 +00:00
Mark Salyzyn
218d49625b am b340d01e: am 9d690250: am 66718d5a: am 894af268: logd: settings: ro.config.low_ram support 
* commit 'b340d01e2cd9564e61c73aa410a794055a46348b':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:59:12 +00:00
Mark Salyzyn
9d690250b8 am 66718d5a: am 894af268: logd: settings: ro.config.low_ram support 
* commit '66718d5a6e51d58a83b186bdd2cc1b6665d0020c':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:32:00 +00:00
Mark Salyzyn
66718d5a6e am 894af268: logd: settings: ro.config.low_ram support 
* commit '894af268def8a817306ea83f21cb25b6f0edf2e3':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:25:54 +00:00
Mark Salyzyn
894af268de logd: settings: ro.config.low_ram support 
- limit settings to 64K, 256K and 1M if ro.config.low_ram true
- Correctly handle ro.logd.size

Bug: 17526187
Change-Id: I2380b649516b29c2a98f54de18e5a4780b3421ce
 2014-09-17 22:26:16 +00:00
PauloftheWest
10773b4d4d Removed an extraneous messge when pairing. 
+ When two devices are executing Bluetooth simply pairing, which does
not need keyboard input, the message "Type the pairing code then press
Return or Enter." has been removed.
+ Note that in legacy pairing the message to type in the pairing key
should remain even if the user is only verifying the key.  The reason is
that we are not able to guarantee the other device does not have to input
the key.
+ Also updated pin entry to Material/Quantum specification.

Bug: 17400402
Change-Id: I7853fa13835f7f60d0e71102de9a079708f3544e
 2014-09-17 14:46:14 -07:00
PauloftheWest
f03f6ab376 am ed9fd0dd: am 01de9832: am b2737bc0: am 3cc81aea: Increase char limit for translation. 
* commit 'ed9fd0ddeda4a3be5f60745af99b8a80460afcae':
  Increase char limit for translation.
 2014-09-17 19:09:08 +00:00
PauloftheWest
01de98321a am b2737bc0: am 3cc81aea: Increase char limit for translation. 
* commit 'b2737bc028cdfc72e81b45b149dc8adde639b6ac':
  Increase char limit for translation.
 2014-09-17 18:36:39 +00:00
PauloftheWest
b2737bc028 am 3cc81aea: Increase char limit for translation. 
* commit '3cc81aeabfca7eeb40a10e2ee70b6619494ecfcb':
  Increase char limit for translation.
 2014-09-17 18:27:04 +00:00
PauloftheWest
3cc81aeabf Increase char limit for translation. 
Bug: 17128776
Change-Id: Ica6d4f895f0991eb99d8e8e6ec0f16deee1312e5
 2014-09-17 08:30:09 -07:00
PauloftheWest
3244c683a2 am 2aed3a5e: am ebb04444: am 9e7073ae: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev 
* commit '2aed3a5ef7c63a29102b405681e0ae15337097d0':
  Alignment updates for Wi-Fi Settings dialog.
 2014-09-17 05:13:07 +00:00
Edward Jee
3c4f081f59 am 69010fb1: am ea9c43ca: am 299faadb: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit '69010fb13af1de42e17e78772c5f85bb1fa28374':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
 2014-09-17 05:13:04 +00:00
PauloftheWest
b268fad47e am 3724edb3: am f4713e0f: am 99f7d73b: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit '3724edb357230c226f1c2b21c5795a97281022f3':
  Removed all references to "Google Wi-Fi Assistant" from Settings.
 2014-09-17 05:13:02 +00:00
Maurice Lam
b3f7de50ab am 9bfbf642: am 24956de0: am 95b283aa: am 795511ec: [WifiSetup] Disable app starting window 
* commit '9bfbf6426bff4c7b8b074f0701dbf539b6c34b51':
  [WifiSetup] Disable app starting window
 2014-09-17 05:12:58 +00:00
Baligh Uddin
422deeb2fb Import translations. DO NOT MERGE 
Change-Id: I74adcddc2559efb083c46667f51b7849dd0cf952
Auto-generated-cl: translation import
 2014-09-16 20:52:09 -07:00
Baligh Uddin
7107f3e324 Import translations. DO NOT MERGE 
Change-Id: Iac811e557bb7b8e9910ff7e9cdcdefad13c99f8a
Auto-generated-cl: translation import
 2014-09-16 20:48:40 -07:00
PauloftheWest
effc8f52af am 9de624d8: am 7b03a452: am dc985292: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 
* commit '9de624d837513b4650f973d609006b03140f5507':
  Updated Wi-Fi Settings icons to new filled-in teal format.
 2014-09-16 21:03:12 +00:00
PauloftheWest
ebb04444a1 am 9e7073ae: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev 
* commit '9e7073aeb9c5ba03fe6d4f4a46a07a20eefad887':
  Alignment updates for Wi-Fi Settings dialog.
 2014-09-16 16:47:35 +00:00
Edward Jee
ea9c43ca65 am 299faadb: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit '299faadbfc73f62ed0e8be968d62a42daf203e87':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
 2014-09-16 16:47:34 +00:00
PauloftheWest
f4713e0fad am 99f7d73b: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit '99f7d73b4722b196ba66d9e70741db0ced53b3c9':
  Removed all references to "Google Wi-Fi Assistant" from Settings.
 2014-09-16 16:47:33 +00:00
Maurice Lam
24956de0e0 am 95b283aa: am 795511ec: [WifiSetup] Disable app starting window 
* commit '95b283aabd26a757bc80abf6beff36346d15b20b':
  [WifiSetup] Disable app starting window
 2014-09-16 16:47:30 +00:00
Baligh Uddin
09a11d5bf4 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:16:37 +00:00
PauloftheWest
9e7073aeb9 am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev 
* commit 'ec21e62a78d98dfb22faeb8bd27ac07061ae83a3':
  Alignment updates for Wi-Fi Settings dialog.
 2014-09-16 08:31:59 +00:00
Edward Jee
299faadbfc am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit 'b0954c1d1e02958fd357cae11613f4539fbe270a':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
 2014-09-16 08:31:58 +00:00
PauloftheWest
99f7d73b47 am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit '0ca0c8ad20e5c630c62bc83e53b8d552a35a3e90':
  Removed all references to "Google Wi-Fi Assistant" from Settings.
 2014-09-16 08:31:57 +00:00
Maurice Lam
95b283aabd am 795511ec: [WifiSetup] Disable app starting window 
* commit '795511ec9c952041afb158d43dd22960443b503f':
  [WifiSetup] Disable app starting window
 2014-09-16 08:31:54 +00:00
PauloftheWest
ec21e62a78 Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev 2014-09-16 02:13:29 +00:00
Edward Jee
b0954c1d1e Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 2014-09-16 01:19:07 +00:00
PauloftheWest
8ad6c3fe55 Alignment updates for Wi-Fi Settings dialog. 
Bug: 17489021
Change-Id: Id394dbe67625cd33745ccbe0f58921fcc38115ec
 2014-09-15 16:49:31 -07:00
Edward Jee
a539716a94 Do not show phonebook access permission dialog if pairing dialog has already been shown. 
Bug: 16964116, 13886947, 16345619

Change-Id: I9cf2622b49c3812771d57432fed030affaa5ba48
 2014-09-15 14:33:13 -07:00
PauloftheWest
0ca0c8ad20 Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 2014-09-15 21:25:13 +00:00
PauloftheWest
7b03a45227 am dc985292: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 
* commit 'dc985292be99c6330ec26a912a5d025f0986158a':
  Updated Wi-Fi Settings icons to new filled-in teal format.
 2014-09-15 19:29:39 +00:00
PauloftheWest
dc985292be am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 
* commit '13fbd848d4d39e81bb79231f1d6f63722a7b36f6':
  Updated Wi-Fi Settings icons to new filled-in teal format.
 2014-09-15 19:04:58 +00:00
Maurice Lam
795511ec9c [WifiSetup] Disable app starting window 
Disable the app starting window when start WifiSetupActivity so that
there will not be a blank black screen the first time this activity
is started.

Bug: 17457465
Change-Id: I4fa019a603a088d458fa9bcf126364fbb49b1b1f
 2014-09-15 11:40:34 -07:00