OSDN Git Service
Dan Sandler [Fri, 19 Sep 2014 04:45:40 +0000 (04:45 +0000)]
am
2a124922: am
c8c5091f: am
3eac072b: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev
* commit '
2a1249225f072915d3fd3b4464fe91ff727e2031':
PauloftheWest [Fri, 19 Sep 2014 04:45:39 +0000 (04:45 +0000)]
am
84acfc61: am
a8d4b005: am
d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev
* commit '
84acfc617e669ffff87d183164298cef9ee421eb':
Baligh Uddin [Fri, 19 Sep 2014 04:45:37 +0000 (04:45 +0000)]
am
7ddba441: (-s ours) am
25728d22: (-s ours) am
48d3f0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
7ddba4418b89e3e66d97c842462fe39b396ed791':
Baligh Uddin [Fri, 19 Sep 2014 04:45:36 +0000 (04:45 +0000)]
am
487e9235: (-s ours) am
d7697f0f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
487e923551735452c76e32c29018b4862314772d':
Import translations. DO NOT MERGE
Wink Saville [Fri, 19 Sep 2014 04:45:35 +0000 (04:45 +0000)]
am
ea569f48: am
98365869: ksd to lmp-sprout-dev
* commit '
ea569f481756ece8f3945de8f1d4630842e2cde8':
ksd to lmp-sprout-dev
PauloftheWest [Thu, 18 Sep 2014 16:24:56 +0000 (16:24 +0000)]
am
58da4c37: am
c932957d: am
0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit '
58da4c37276ba1102a4a524b2a56c0b5db0e477f':
Removed an extraneous messge when pairing.
PauloftheWest [Thu, 18 Sep 2014 16:12:14 +0000 (16:12 +0000)]
am
c932957d: am
0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit '
c932957d4e56c756acea56c11347b4da35a30983':
Removed an extraneous messge when pairing.
PauloftheWest [Thu, 18 Sep 2014 16:00:59 +0000 (16:00 +0000)]
am
0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit '
0f01eeff84ebdb93f24398d3adb5f214ae1ce2bb':
Removed an extraneous messge when pairing.
PauloftheWest [Thu, 18 Sep 2014 15:51:49 +0000 (15:51 +0000)]
Merge "Removed an extraneous messge when pairing." into lmp-dev
Sander Alewijnse [Thu, 18 Sep 2014 12:07:39 +0000 (12:07 +0000)]
am
0fe16796: am
c995e733: am
4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
* commit '
0fe16796c55091ed7b75f75fdeed5b0e5b03da30':
Update targetSdkVersion check.
Sander Alewijnse [Thu, 18 Sep 2014 11:56:32 +0000 (11:56 +0000)]
am
c995e733: am
4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
* commit '
c995e73391bb4f46154d506f198ee4dec85bae4c':
Update targetSdkVersion check.
Sander Alewijnse [Thu, 18 Sep 2014 11:46:11 +0000 (11:46 +0000)]
am
4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
* commit '
4241b0a9627e424adb897ec894a34ddce8fd77e3':
Update targetSdkVersion check.
Sander Alewijnse [Thu, 18 Sep 2014 11:36:30 +0000 (11:36 +0000)]
Merge "Update targetSdkVersion check." into lmp-dev
Mark Salyzyn [Wed, 17 Sep 2014 23:46:59 +0000 (23:46 +0000)]
am
22955813: am
5f288bc1: am
894af268: logd: settings: ro.config.low_ram support
* commit '
229558137318fdebce6b1bf3f5b30ea96e65a400':
logd: settings: ro.config.low_ram support
Mark Salyzyn [Wed, 17 Sep 2014 23:32:07 +0000 (23:32 +0000)]
am
5f288bc1: am
894af268: logd: settings: ro.config.low_ram support
* commit '
5f288bc17c79c76090075db3a8a307c6421b9eb0':
logd: settings: ro.config.low_ram support
Mark Salyzyn [Wed, 17 Sep 2014 23:25:57 +0000 (23:25 +0000)]
am
894af268: logd: settings: ro.config.low_ram support
* commit '
894af268def8a817306ea83f21cb25b6f0edf2e3':
logd: settings: ro.config.low_ram support
Mark Salyzyn [Wed, 17 Sep 2014 21:05:15 +0000 (14:05 -0700)]
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
PauloftheWest [Tue, 16 Sep 2014 19:29:17 +0000 (12:29 -0700)]
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
Amith Yamasani [Wed, 17 Sep 2014 20:38:49 +0000 (20:38 +0000)]
am
2f8b4173: am
ae2da7a9: am
69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
* commit '
2f8b4173581bb7a7421f6c49dee236cdebc66aaf':
Don't allow creating a guest from a secondary user...
Amith Yamasani [Wed, 17 Sep 2014 20:28:06 +0000 (20:28 +0000)]
am
ae2da7a9: am
69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
* commit '
ae2da7a90bd9dad3522611f1f105788e1d11fe81':
Don't allow creating a guest from a secondary user...
Amith Yamasani [Wed, 17 Sep 2014 20:16:43 +0000 (20:16 +0000)]
am
69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
* commit '
69b674656af869219189fe0f7985c011d29d9b7e':
Don't allow creating a guest from a secondary user...
Amith Yamasani [Wed, 17 Sep 2014 20:06:59 +0000 (20:06 +0000)]
Merge "Don't allow creating a guest from a secondary user..." into lmp-dev
John Spurlock [Wed, 17 Sep 2014 19:59:34 +0000 (19:59 +0000)]
am
ab4fe2d9: am
9e51261d: am
ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
* commit '
ab4fe2d94fc1a0f142a390ef25ca64bc83fa17a0':
Settings: Ensure CryptKeeper dismisses secure keyguards.
John Spurlock [Wed, 17 Sep 2014 19:53:54 +0000 (19:53 +0000)]
am
9e51261d: am
ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
* commit '
9e51261dcc5db11be92660a3bde6b1f1e59ee128':
Settings: Ensure CryptKeeper dismisses secure keyguards.
John Spurlock [Wed, 17 Sep 2014 19:48:11 +0000 (19:48 +0000)]
am
ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
* commit '
ae9d437b4ab8dc98c347e4218390a38900979faa':
Settings: Ensure CryptKeeper dismisses secure keyguards.
John Spurlock [Wed, 17 Sep 2014 19:37:27 +0000 (19:37 +0000)]
Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
PauloftheWest [Wed, 17 Sep 2014 18:49:59 +0000 (18:49 +0000)]
am
63f9500e: am
08183704: am
3cc81aea: Increase char limit for translation.
* commit '
63f9500e0daae4b9aeda2bf4282bbe5dd8925b8e':
Increase char limit for translation.
PauloftheWest [Wed, 17 Sep 2014 18:41:09 +0000 (18:41 +0000)]
am
08183704: am
3cc81aea: Increase char limit for translation.
* commit '
0818370405da62d427620da5407ca4c5f9c969a0':
Increase char limit for translation.
PauloftheWest [Wed, 17 Sep 2014 18:30:12 +0000 (18:30 +0000)]
am
3cc81aea: Increase char limit for translation.
* commit '
3cc81aeabfca7eeb40a10e2ee70b6619494ecfcb':
Increase char limit for translation.
John Spurlock [Wed, 17 Sep 2014 16:55:17 +0000 (12:55 -0400)]
Settings: Ensure CryptKeeper dismisses secure keyguards.
Otherwise, the lockscreen can be shown during the decryption
challenge, which hides the challenge activity window until
the next reboot.
Bug:
17512377
Change-Id: Idb6b5b3dddb3cf2dc70b784413ea310c401880af
PauloftheWest [Wed, 17 Sep 2014 15:30:09 +0000 (08:30 -0700)]
Increase char limit for translation.
Bug:
17128776
Change-Id: Ica6d4f895f0991eb99d8e8e6ec0f16deee1312e5
Amith Yamasani [Tue, 16 Sep 2014 23:36:40 +0000 (16:36 -0700)]
Don't allow creating a guest from a secondary user...
unless the primary user has allowed Guest and user creation from
lockscreen.
Bug:
17482220
Change-Id: Idd05889da330d6cbe0d3ccab2e98abfdeba94b96
Maurice Lam [Tue, 16 Sep 2014 19:44:14 +0000 (19:44 +0000)]
am
2ffb10d2: am
fd4e0f25: am
27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
* commit '
2ffb10d28bd1945004bd29390803a81ce5bf3338':
[WifiSetup] Update connection state for auto-finish
Maurice Lam [Tue, 16 Sep 2014 19:36:47 +0000 (19:36 +0000)]
am
fd4e0f25: am
27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
* commit '
fd4e0f2567c97c71615d8defc3b12ed51ce77c05':
[WifiSetup] Update connection state for auto-finish
Maurice Lam [Tue, 16 Sep 2014 18:47:07 +0000 (18:47 +0000)]
am
27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
* commit '
27d74fa288c195aa5e1190da5599965472f1aded':
[WifiSetup] Update connection state for auto-finish
Maurice Lam [Tue, 16 Sep 2014 18:35:38 +0000 (18:35 +0000)]
Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
Baligh Uddin [Tue, 16 Sep 2014 18:22:37 +0000 (18:22 +0000)]
am
fbb0218a: (-s ours) am
1741abb9: (-s ours) am
09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
fbb0218a117df5537f6ef2835a673ef485e1cdb1':
Import translations. DO NOT MERGE
Maurice Lam [Tue, 16 Sep 2014 03:40:26 +0000 (20:40 -0700)]
[WifiSetup] Update connection state for auto-finish
In Wi-Fi setup, when the connection state changed, query
ConnectivityManager for the latest Wi-Fi connection state instead of
relying the NetworkInfo attached in the intent, because the first
network info upon changing AP still shows the network as connected.
Bug:
17511772
Change-Id: I9c7765086dc8fbc5e1c2a37124ca89db3eab04a3
Baligh Uddin [Tue, 16 Sep 2014 18:03:21 +0000 (18:03 +0000)]
am
1741abb9: (-s ours) am
09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
1741abb95c2a30cd10ba829aca345b3d919f3ef6':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Sep 2014 15:26:42 +0000 (15:26 +0000)]
am
09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
09a11d5bf4c42a7cd2eac4469933109a29f5bb68':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Sep 2014 15:16:36 +0000 (15:16 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
PauloftheWest [Tue, 16 Sep 2014 09:07:08 +0000 (09:07 +0000)]
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.
Edward Jee [Tue, 16 Sep 2014 09:07:07 +0000 (09:07 +0000)]
am
000dd0a6: am
a99ef887: am
ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
* commit '
000dd0a6b24a8c383a2051201699bd2c93bc4159':
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
Edward Jee [Tue, 16 Sep 2014 09:07:06 +0000 (09:07 +0000)]
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.
PauloftheWest [Tue, 16 Sep 2014 09:07:05 +0000 (09:07 +0000)]
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.
Dianne Hackborn [Tue, 16 Sep 2014 09:07:04 +0000 (09:07 +0000)]
am
2acec676: am
bf4ecab3: am
94aae9af: Little more on issue #
17495264: tweak when we ignore initial times.
* commit '
2acec6768fc67516eff484f6d4f8de607a597a60':
Little more on issue #
17495264: tweak when we ignore initial times.
Dianne Hackborn [Tue, 16 Sep 2014 09:07:03 +0000 (09:07 +0000)]
am
ff966f2a: am
829b9975: am
ecffbc91: Merge "Fix issue #
17495264: Battery history graph is bad" into lmp-dev
* commit '
ff966f2a82044bed1d9d791be9aa0c30c8bb26cc':
Fix issue #
17495264: Battery history graph is bad
Maurice Lam [Tue, 16 Sep 2014 09:07:02 +0000 (09:07 +0000)]
am
ea8db10a: am
0d09c6c1: am
795511ec: [WifiSetup] Disable app starting window
* commit '
ea8db10ac8fc3aafd7834c401aacf7245b244936':
[WifiSetup] Disable app starting window
PauloftheWest [Tue, 16 Sep 2014 08:52:57 +0000 (08:52 +0000)]
am
9007cf63: am
ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
* commit '
9007cf6369eee6179082de8c769da6cad4906831':
Alignment updates for Wi-Fi Settings dialog.
Edward Jee [Tue, 16 Sep 2014 08:52:57 +0000 (08:52 +0000)]
am
a99ef887: am
ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
* commit '
a99ef8871e204a04bc2b6436eede2078f8001b98':
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
Edward Jee [Tue, 16 Sep 2014 08:52:55 +0000 (08:52 +0000)]
am
50b6eec9: am
b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
* commit '
50b6eec908fa76dfe426016d621cda3b013846b1':
Do not show phonebook access permission dialog if pairing dialog has already been shown.
PauloftheWest [Tue, 16 Sep 2014 08:52:54 +0000 (08:52 +0000)]
am
720af580: am
0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
* commit '
720af58039c31bbf9f239600a898202b971987f5':
Removed all references to "Google Wi-Fi Assistant" from Settings.
Dianne Hackborn [Tue, 16 Sep 2014 08:52:53 +0000 (08:52 +0000)]
am
bf4ecab3: am
94aae9af: Little more on issue #
17495264: tweak when we ignore initial times.
* commit '
bf4ecab3ebf691dec8c2734f3dce9a547ea32ad5':
Little more on issue #
17495264: tweak when we ignore initial times.
Dianne Hackborn [Tue, 16 Sep 2014 08:52:52 +0000 (08:52 +0000)]
am
829b9975: am
ecffbc91: Merge "Fix issue #
17495264: Battery history graph is bad" into lmp-dev
* commit '
829b9975b682fcc2c2404fa1ec7397ee5d4cfcae':
Fix issue #
17495264: Battery history graph is bad
Maurice Lam [Tue, 16 Sep 2014 08:52:51 +0000 (08:52 +0000)]
am
0d09c6c1: am
795511ec: [WifiSetup] Disable app starting window
* commit '
0d09c6c190436ffc28dd9c04af1a1e7aa203463c':
[WifiSetup] Disable app starting window
PauloftheWest [Tue, 16 Sep 2014 08:32:12 +0000 (08:32 +0000)]
am
ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
* commit '
ec21e62a78d98dfb22faeb8bd27ac07061ae83a3':
Alignment updates for Wi-Fi Settings dialog.
Edward Jee [Tue, 16 Sep 2014 08:32:11 +0000 (08:32 +0000)]
am
ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
* commit '
ac8b5b7fd6b6774d22d39bb9a4becca1908915c7':
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
Edward Jee [Tue, 16 Sep 2014 08:32:10 +0000 (08:32 +0000)]
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.
PauloftheWest [Tue, 16 Sep 2014 08:32:09 +0000 (08:32 +0000)]
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.
Dianne Hackborn [Tue, 16 Sep 2014 08:32:08 +0000 (08:32 +0000)]
am
94aae9af: Little more on issue #
17495264: tweak when we ignore initial times.
* commit '
94aae9afd18c17848aed68addd19d93c937c7555':
Little more on issue #
17495264: tweak when we ignore initial times.
Dianne Hackborn [Tue, 16 Sep 2014 08:32:07 +0000 (08:32 +0000)]
am
ecffbc91: Merge "Fix issue #
17495264: Battery history graph is bad" into lmp-dev
* commit '
ecffbc91b15ec558be27fd171a64ad5db9e2b7d1':
Fix issue #
17495264: Battery history graph is bad
Maurice Lam [Tue, 16 Sep 2014 08:32:06 +0000 (08:32 +0000)]
am
795511ec: [WifiSetup] Disable app starting window
* commit '
795511ec9c952041afb158d43dd22960443b503f':
[WifiSetup] Disable app starting window
PauloftheWest [Tue, 16 Sep 2014 08:30:51 +0000 (08:30 +0000)]
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.
PauloftheWest [Tue, 16 Sep 2014 02:13:29 +0000 (02:13 +0000)]
Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
Edward Jee [Mon, 8 Sep 2014 23:45:29 +0000 (16:45 -0700)]
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
Currently, users' preference in phonebook and call history or message
access per each Bluetooth-paired device is stored in Settings application's
shared preferences.
However, some privileged applications other than Settings need to access
such data. So we decided to migrate the data from Settings application's
shared preferences to Bluetooth application's.
Bug:
17158953
Change-Id: I44fde350ea35027df0de77feec1ea19c65f2f1c6
Edward Jee [Tue, 16 Sep 2014 01:19:07 +0000 (01:19 +0000)]
Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
Dan Sandler [Mon, 15 Sep 2014 23:54:53 +0000 (23:54 +0000)]
am
c8c5091f: am
3eac072b: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev
* commit '
c8c5091f2612f2e74eb678727da7fb1e80210de3':
PauloftheWest [Mon, 15 Sep 2014 23:54:52 +0000 (23:54 +0000)]
am
a8d4b005: am
d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev
* commit '
a8d4b00508c6cfc975a47d956f2c460ef375c8cc':
Baligh Uddin [Mon, 15 Sep 2014 23:54:50 +0000 (23:54 +0000)]
am
25728d22: (-s ours) am
48d3f0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
25728d220a3fa5cc40d20e436ca72f24a85a365c':
Baligh Uddin [Mon, 15 Sep 2014 23:54:48 +0000 (23:54 +0000)]
am
d7697f0f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
d7697f0f113536d65a811e8def4a2a2c4eae827a':
Import translations. DO NOT MERGE
Wink Saville [Mon, 15 Sep 2014 23:54:47 +0000 (23:54 +0000)]
am
98365869: ksd to lmp-sprout-dev
* commit '
983658696be22aa55dc5b37c666cedb8826ded83':
ksd to lmp-sprout-dev
PauloftheWest [Mon, 15 Sep 2014 16:27:25 +0000 (09:27 -0700)]
Alignment updates for Wi-Fi Settings dialog.
Bug:
17489021
Change-Id: Id394dbe67625cd33745ccbe0f58921fcc38115ec
Edward Jee [Fri, 5 Sep 2014 05:18:21 +0000 (22:18 -0700)]
Do not show phonebook access permission dialog if pairing dialog has already been shown.
Bug:
16964116,
13886947,
16345619
Change-Id: I9cf2622b49c3812771d57432fed030affaa5ba48
PauloftheWest [Mon, 15 Sep 2014 21:25:13 +0000 (21:25 +0000)]
Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
Dianne Hackborn [Sun, 14 Sep 2014 21:39:52 +0000 (14:39 -0700)]
Little more on issue #
17495264: tweak when we ignore initial times.
Change-Id: I7053eb64d7d2281984baef9606334c2df4783cc5
Dianne Hackborn [Mon, 15 Sep 2014 20:51:46 +0000 (20:51 +0000)]
Merge "Fix issue #
17495264: Battery history graph is bad" into lmp-dev
PauloftheWest [Mon, 15 Sep 2014 19:31:20 +0000 (19:31 +0000)]
am
24233660: am
13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
* commit '
2423366021337a4fff71defdd1c6484df10c0e3b':
Updated Wi-Fi Settings icons to new filled-in teal format.
PauloftheWest [Mon, 15 Sep 2014 19:05:48 +0000 (19:05 +0000)]
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.
Maurice Lam [Mon, 15 Sep 2014 18:40:34 +0000 (11:40 -0700)]
[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
Sander Alewijnse [Mon, 15 Sep 2014 14:44:01 +0000 (15:44 +0100)]
Update targetSdkVersion check.
Bug:
16509819
Change-Id: Ibc0afd234eaa13c1862c8e8dd60d68940aa559f5
PauloftheWest [Thu, 11 Sep 2014 23:10:18 +0000 (16:10 -0700)]
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
PauloftheWest [Mon, 15 Sep 2014 14:35:45 +0000 (14:35 +0000)]
Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
Baligh Uddin [Mon, 15 Sep 2014 06:05:45 +0000 (23:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8afcd11572e8785a6ded163f1fb9d267730fa9a1
Auto-generated-cl: translation import
Dianne Hackborn [Sun, 14 Sep 2014 21:39:52 +0000 (14:39 -0700)]
Fix issue #
17495264: Battery history graph is bad
Deal better with wall clock time changes in the battery history.
Change-Id: I9d63edafc37bbf663e328a08ba09300be2142594
Prem Kumar [Mon, 15 Sep 2014 00:30:27 +0000 (00:30 +0000)]
am
1097e836: am
2ce54402: am
c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
* commit '
1097e836e4c1e9a32f1349abce0f9afffecde5cd':
Remove UI for Forget AP as a secondary user.
Prem Kumar [Mon, 15 Sep 2014 00:15:04 +0000 (00:15 +0000)]
am
2ce54402: am
c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
* commit '
2ce5440203684e064102ba3e7ce9bccec4a76610':
Remove UI for Forget AP as a secondary user.
Prem Kumar [Mon, 15 Sep 2014 00:00:25 +0000 (00:00 +0000)]
am
c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
* commit '
c0deb7dac00b4fcbc64866042788e3247474538e':
Remove UI for Forget AP as a secondary user.
Prem Kumar [Sun, 14 Sep 2014 23:51:21 +0000 (23:51 +0000)]
Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
John Spurlock [Sun, 14 Sep 2014 20:21:37 +0000 (20:21 +0000)]
am
3ea47dd0: am
89147d72: am
2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
* commit '
3ea47dd0631592aaa6c2a89e5e8abb10bd5175eb':
Settings: Use new PowerManager call to set low power mode.
John Spurlock [Sun, 14 Sep 2014 20:09:40 +0000 (20:09 +0000)]
am
89147d72: am
2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
* commit '
89147d726b0f3c4e69f3028c8043f71c14bc6f81':
Settings: Use new PowerManager call to set low power mode.
John Spurlock [Sun, 14 Sep 2014 19:51:01 +0000 (19:51 +0000)]
am
2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
* commit '
2e205e9b4b16133b29efba91e67bee8f20a51a88':
Settings: Use new PowerManager call to set low power mode.
John Spurlock [Sun, 14 Sep 2014 19:36:18 +0000 (19:36 +0000)]
Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
John Spurlock [Sun, 14 Sep 2014 15:20:37 +0000 (11:20 -0400)]
Settings: Use new PowerManager call to set low power mode.
Bind the master switch to the power manager state instead
of directly to the single setting.
Depends on frameworks/base change:
Ic030504c9cad9868a7137abbe837b170da37852b
Bug:
17460535
Change-Id: I8c68735308f58fdc07d4f64e765e84286918be7a
Tyler Gunn [Sat, 13 Sep 2014 18:19:37 +0000 (18:19 +0000)]
am
09504093: am
d03caf70: am
3e71b197: Renaming Telecomm to Telecom.
* commit '
09504093500b6b931cdc87fd696574b64b8d852a':
Renaming Telecomm to Telecom.
Tyler Gunn [Sat, 13 Sep 2014 18:03:11 +0000 (18:03 +0000)]
am
d03caf70: am
3e71b197: Renaming Telecomm to Telecom.
* commit '
d03caf70865f50f74db2613f9d0c68ee50e22190':
Renaming Telecomm to Telecom.
Tyler Gunn [Sat, 13 Sep 2014 17:47:28 +0000 (17:47 +0000)]
am
3e71b197: Renaming Telecomm to Telecom.
* commit '
3e71b197f7f85c5045a083ecc532954958807be6':
Renaming Telecomm to Telecom.
Tyler Gunn [Wed, 10 Sep 2014 22:21:33 +0000 (15:21 -0700)]
Renaming Telecomm to Telecom.
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.
Bug:
17364651
Change-Id: Ia6e2d082eac1c1f306da691e95dd9bfb9afd37eb
Paul Lawrence [Sat, 13 Sep 2014 02:27:46 +0000 (02:27 +0000)]
am
fd2a3036: am
dbb4a6b7: am
c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
* commit '
fd2a303616523ba3eae5105298bfd5addebb617f':
Prevent PIN/Passwword disappearing during boot
Kenny Guy [Sat, 13 Sep 2014 02:22:20 +0000 (02:22 +0000)]
am
31095ca6: am
f57f94e9: am
db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev
* commit '
31095ca6e573d5df86e153e6464faa28ae907a75':
Fix crash when showing accounts.
Paul Lawrence [Fri, 12 Sep 2014 23:22:13 +0000 (23:22 +0000)]
am
dbb4a6b7: am
c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
* commit '
dbb4a6b704e8feaba5f31623c66ee30fef8af680':
Prevent PIN/Passwword disappearing during boot