PauloftheWest
b26eb21111
am 58da4c37
: am c932957d
: am 0f01eeff
: Merge "Removed an extraneous messge when pairing." into lmp-dev
...
* commit '58da4c37276ba1102a4a524b2a56c0b5db0e477f':
Removed an extraneous messge when pairing.
2014-09-18 16:24:56 +00:00
PauloftheWest
c932957d4e
am 0f01eeff
: Merge "Removed an extraneous messge when pairing." into lmp-dev
...
* commit '0f01eeff84ebdb93f24398d3adb5f214ae1ce2bb':
Removed an extraneous messge when pairing.
2014-09-18 16:00:59 +00:00
PauloftheWest
0f01eeff84
Merge "Removed an extraneous messge when pairing." into lmp-dev
2014-09-18 15:51:50 +00:00
Mark Salyzyn
0e77a346bb
am 22955813
: am 5f288bc1
: am 894af268
: logd: settings: ro.config.low_ram support
...
* commit '229558137318fdebce6b1bf3f5b30ea96e65a400':
logd: settings: ro.config.low_ram support
2014-09-17 23:46:59 +00:00
Mark Salyzyn
5f288bc17c
am 894af268
: logd: settings: ro.config.low_ram support
...
* commit '894af268def8a817306ea83f21cb25b6f0edf2e3':
logd: settings: ro.config.low_ram support
2014-09-17 23:25:57 +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
13a63ef39b
am 63f9500e
: am 08183704
: am 3cc81aea
: Increase char limit for translation.
...
* commit '63f9500e0daae4b9aeda2bf4282bbe5dd8925b8e':
Increase char limit for translation.
2014-09-17 18:49:59 +00:00
PauloftheWest
0818370405
am 3cc81aea
: Increase char limit for translation.
...
* commit '3cc81aeabfca7eeb40a10e2ee70b6619494ecfcb':
Increase char limit for translation.
2014-09-17 18:30:12 +00:00
PauloftheWest
3cc81aeabf
Increase char limit for translation.
...
Bug: 17128776
Change-Id: Ica6d4f895f0991eb99d8e8e6ec0f16deee1312e5
2014-09-17 08:30:09 -07:00
Baligh Uddin
09a11d5bf4
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-16 15:16:37 +00:00
PauloftheWest
79c32a04b5
am d1cd913a
: am 9007cf63
: am ec21e62a
: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
...
* commit 'd1cd913a6e1dc35da4d5e0c1fc4b48a0e382d486':
Alignment updates for Wi-Fi Settings dialog.
2014-09-16 09:07:08 +00:00
Edward Jee
170be5c8c8
am 32c56ed4
: am 50b6eec9
: am b0954c1d
: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
...
* commit '32c56ed434dbeec9cf2b0db62f43396d5b2a08d5':
Do not show phonebook access permission dialog if pairing dialog has already been shown.
2014-09-16 09:07:06 +00:00
PauloftheWest
88f7fa0b9e
am 8dee66d1
: am 720af580
: am 0ca0c8ad
: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
...
* commit '8dee66d1248af1aa28b32d11b1b3160ab3a79437':
Removed all references to "Google Wi-Fi Assistant" from Settings.
2014-09-16 09:07:05 +00:00
Maurice Lam
e1300a2c9b
am ea8db10a
: am 0d09c6c1
: am 795511ec
: [WifiSetup] Disable app starting window
...
* commit 'ea8db10ac8fc3aafd7834c401aacf7245b244936':
[WifiSetup] Disable app starting window
2014-09-16 09:07:02 +00:00
PauloftheWest
9007cf6369
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:32:12 +00:00
Edward Jee
50b6eec908
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:32:10 +00:00
PauloftheWest
720af58039
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:32:09 +00:00
Maurice Lam
0d09c6c190
am 795511ec
: [WifiSetup] Disable app starting window
...
* commit '795511ec9c952041afb158d43dd22960443b503f':
[WifiSetup] Disable app starting window
2014-09-16 08:32:06 +00:00
PauloftheWest
9b6f42b309
am f1fc7219
: am 24233660
: am 13fbd848
: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
...
* commit 'f1fc7219298b5c8dd0bf5c695f3f3942289a05df':
Updated Wi-Fi Settings icons to new filled-in teal format.
2014-09-16 08:30:51 +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
2423366021
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:05:48 +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
PauloftheWest
f4b548c0f5
Removed all references to "Google Wi-Fi Assistant" from Settings.
...
+ Removed Wi-Fi Assistant message in Wi-Fi Advanced since it was
overridden by the Wi-Fi Assistant.
+ Removed Wi-Fi Assistant message in Wi-Fi Assistant Card. Instead,
it is programatically created when the scorer is known.
+ "Google" was replaced with a placeholder.
Bug: 17457236
Change-Id: If3aab06c911ecf6ec13cbf00dea2fe9333abc1fc
2014-09-15 09:31:56 -07:00
PauloftheWest
13fbd848d4
Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
2014-09-15 14:35:46 +00:00
Baligh Uddin
9ad0d03486
Import translations. DO NOT MERGE
...
Change-Id: I8afcd11572e8785a6ded163f1fb9d267730fa9a1
Auto-generated-cl: translation import
2014-09-14 23:05:45 -07:00
Alexandra Gherghina
b5c7c79a0a
am 02d41b91
: am 0bf3dc02
: am f738895d
: Merge "Switch to using system-wide default user icons" into lmp-dev
...
* commit '02d41b916c24eb458b7ce695d0663cbe6c49a4b8':
Switch to using system-wide default user icons
2014-09-12 19:29:07 +00:00
Svetoslav
f759e33cd5
am 400cd755
: am a6e4db3c
: am 72cfbcb4
: Merge "Fix print icons in settings." into lmp-dev
...
* commit '400cd7554d31d76e7c8dab5d3386d2f038700977':
Fix print icons in settings.
2014-09-12 19:18:06 +00:00
Alexandra Gherghina
0bf3dc02ce
am f738895d
: Merge "Switch to using system-wide default user icons" into lmp-dev
...
* commit 'f738895dc06c5afd6c9525e49eaa50566580d8d6':
Switch to using system-wide default user icons
2014-09-12 17:31:21 +00:00
Alexandra Gherghina
f738895dc0
Merge "Switch to using system-wide default user icons" into lmp-dev
2014-09-12 16:03:53 +00:00
Alexandra Gherghina
bc6e78f9da
Switch to using system-wide default user icons
...
User icons were either User Settings specific, or missing. This makes it
consistent with the ones in the new helper class.
Bug: 17311038
Change-Id: I20cc1deba989cf7a397c5a8dba41bd91bd62472b
2014-09-12 17:00:40 +01:00
PauloftheWest
7e6e7acbf1
Updated Wi-Fi Settings icons to new filled-in teal format.
...
+ Added a filled-in teal Wi-Fi unlocked and locked icons.
+ Added a teal theme to Settings.
+ Updated Wi-Fi Settings and Setup Wizard to use the new teal format.
+ Updated the Settings icon (used in the Settings dashboard and in
search) to the new format.
Bug: 17331199
Change-Id: I0565ef6f2fa1be035c1bd150ea853cb976dc504c
2014-09-12 07:18:10 -07:00
Svetoslav
a6e4db3ce0
am 72cfbcb4
: Merge "Fix print icons in settings." into lmp-dev
...
* commit '72cfbcb42952a8799daa497bf8034b2f033fad9e':
Fix print icons in settings.
2014-09-11 17:40:06 +00:00
Svetoslav
72cfbcb429
Merge "Fix print icons in settings." into lmp-dev
2014-09-11 17:28:32 +00:00
PauloftheWest
ac0af801ac
am c0a2603e
: am 3c46239f
: am b2197d90
: Added bluetooth_device_settings_header to fix build breakage.
...
* commit 'c0a2603e5a86c52dcb7f2c9c5754808dfc84eb0f':
Added bluetooth_device_settings_header to fix build breakage.
2014-09-11 17:26:24 +00:00
PauloftheWest
8e38f30c26
am 4f006d9d
: am e9cb4bf2
: am 1675c786
: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
...
* commit '4f006d9dd14cc5efe0dc454c29d9845ce84cf466':
Made Bluetooth device dialog fully scrollable.
2014-09-11 17:25:22 +00:00
John Spurlock
b9b559cfa6
am a3eee6fb
: am 4fba99a9
: am 31915522
: Settings: Remove fixed dropdown width from "From" pref.
...
* commit 'a3eee6fb2d94561f1d2b28be1b6f1255d95fbb29':
Settings: Remove fixed dropdown width from "From" pref.
2014-09-11 17:25:19 +00:00
Fabrice Di Meglio
75cefd093c
am e384b253
: am 263233b2
: am 877fb7fb
: Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev
...
* commit 'e384b2534b5230d61cfb88e136528002a187533b':
Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility
2014-09-11 17:22:19 +00:00
Baligh Uddin
9b45212b1d
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-11 15:49:25 +00:00
Baligh Uddin
330ac54067
Merge "Import translations. DO NOT MERGE"
2014-09-11 15:49:22 +00:00
John Spurlock
c46156277a
am 77056e3f
: am 740eeb97
: am cddb2954
: Settings: Make downtime days scrollable.
...
* commit '77056e3f04dcacea63a7da0cbb3483e91927e3d1':
Settings: Make downtime days scrollable.
2014-09-11 14:14:12 +00:00
Svetoslav
031e8b1432
Fix print icons in settings.
...
The print icons are in the framework resources and are not tinted
to enable usage from various places such as print spooler and
settings with different tinting. Settings was using not-tinted
print icons which were invisible on the white background. This
change switches settings to user tinted drawables.
bug:16966145
Change-Id: I2cf55d36d90b0192ba23686aac4f1d8e7e23f75a
2014-09-10 18:33:32 -07:00
PauloftheWest
3c46239f1b
am b2197d90
: Added bluetooth_device_settings_header to fix build breakage.
...
* commit 'b2197d90a8f173ef6ca3071aa434cc7283f85a42':
Added bluetooth_device_settings_header to fix build breakage.
2014-09-10 23:33:20 +00:00
PauloftheWest
b2197d90a8
Added bluetooth_device_settings_header to fix build breakage.
...
Change-Id: Ieca78c6bc34119e0cccc51a27cbcbf966b913bb1
2014-09-10 16:22:15 -07:00
PauloftheWest
e9cb4bf280
am 1675c786
: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
...
* commit '1675c786bfe213cce0d454d9eaf5fb51b4b4520c':
Made Bluetooth device dialog fully scrollable.
2014-09-10 22:17:25 +00:00
PauloftheWest
1675c786bf
Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
2014-09-10 22:11:56 +00:00