Geoff Mendal
c064ecdf79
am 3ca58bbd
: (-s ours) Import translations. DO NOT MERGE
...
* commit '3ca58bbda3d1daacc6750a1502a775641b2d0961':
Import translations. DO NOT MERGE
2015-08-08 14:36:30 +00:00
Geoff Mendal
3ca58bbda3
Import translations. DO NOT MERGE
...
Change-Id: I49911941b08daff0dce1d0ec3ca9b21ae209650b
Auto-generated-cl: translation import
2015-08-08 07:26:58 -07:00
Jeff Sharkey
0f4465a4cd
am 11088b81
: am cb0c0718
: am 67f0739c
: Merge "Block moving when already in progress." into mnc-dev
...
* commit '11088b815b030114b14f8a3e7d81d9238c2d51b8':
Block moving when already in progress.
2015-08-08 00:06:40 +00:00
Jeff Sharkey
11088b815b
am cb0c0718
: am 67f0739c
: Merge "Block moving when already in progress." into mnc-dev
...
* commit 'cb0c07181a77ef134310c0e037345f33e7a46d9e':
Block moving when already in progress.
2015-08-07 23:58:46 +00:00
Jeff Sharkey
cb0c07181a
am 67f0739c
: Merge "Block moving when already in progress." into mnc-dev
...
* commit '67f0739ca3a81515975856b09d216debfd090ae9':
Block moving when already in progress.
2015-08-07 23:51:57 +00:00
Jeff Sharkey
67f0739ca3
Merge "Block moving when already in progress." into mnc-dev
2015-08-07 23:38:44 +00:00
Jeff Sharkey
16634fd0ff
Block moving when already in progress.
...
Use frozen state as a proxy for knowing if a package is currently
being moved, and block any new move requests until the current move
is finished.
Bug: 22069486
Change-Id: I50a70353132c1035b969982f0b7779f5dcb2251d
2015-08-07 15:59:28 -07:00
Billy Lau
16dc289d5b
am 8c26cbd8
: am 5b2c66e4
: am a59f39fc
: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit '8c26cbd87e8fe5880f84c5a27c89176e045f6669':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:36:29 +00:00
Billy Lau
8c26cbd87e
am 5b2c66e4
: am a59f39fc
: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit '5b2c66e4da749ca59d09776ec7831e20d1211909':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:28:38 +00:00
Billy Lau
5b2c66e4da
am a59f39fc
: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit 'a59f39fca65d0828b0e4ade95a8404282e858ba9':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:22:19 +00:00
Dianne Hackborn
a3e6657658
am 1ded4413
: am 7a3a4533
: am e7a5966a
: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit '1ded441390e79dc46d576dadbbf1a69da12d399d':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-07 22:20:50 +00:00
Billy Lau
a59f39fca6
Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
2015-08-07 22:15:32 +00:00
Dianne Hackborn
1ded441390
am 7a3a4533
: am e7a5966a
: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit '7a3a453349fb51043d84adc21f87472ba34c49a8':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-07 22:12:58 +00:00
Dianne Hackborn
7a3a453349
am e7a5966a
: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit 'e7a5966aa72a7a64358e4092fa3fe2b46b28c420':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-07 22:05:56 +00:00
Dianne Hackborn
e7a5966aa7
Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
2015-08-07 21:58:52 +00:00
Dianne Hackborn
f5497aa93c
Fix issue #23037720 : New Battery Optimization Strings
...
Thar be strings.
Change-Id: Ieb43d041912cc5d2cc181d3232e01dbfce6cbc0e
2015-08-07 14:43:55 -07:00
Dianne Hackborn
a1e572c528
Fix issue #23037720 : New Battery Optimization Strings
...
There be strings.
Change-Id: I92d4bd64f36f7d186a383178d55fbff26078509c
2015-08-07 14:38:58 -07:00
Pavel Zhamaitsiak
2fe4b3cb9e
Ensure that listener is removed only if it was added
...
Bug: 23016088
Change-Id: Ia6f17739ffc841ce8483e9c6c8132a94ecd62200
2015-08-07 12:02:38 -07:00
Maurice Lam
d62aabf10d
[Fingerprint] Use different ring size for setup
...
Follow-up on ag/741340, to split the size of the fingerprint ring
during setup vs in settings. The ring in settings is slightly bigger
because the header is smaller and the error text will not be cropped.
Bug: 22924280
Change-Id: I4b9a817c85a3683924a01e41552ca80c85423f29
2015-08-07 10:48:48 -07:00
Julia Reynolds
559a3e7886
am e113f0c4
: am b7028f25
: am 5ab0e183
: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
...
* commit 'e113f0c4876b7529170768f8c7cf99f218d48ca8':
Hide optimization control on battery details page for non whitelisted apps.
2015-08-07 16:52:11 +00:00
Julia Reynolds
e113f0c487
am b7028f25
: am 5ab0e183
: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
...
* commit 'b7028f254de1f7fdda5c3ee248f2e5a9294cc4dd':
Hide optimization control on battery details page for non whitelisted apps.
2015-08-07 16:45:04 +00:00
Julia Reynolds
b7028f254d
am 5ab0e183
: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
...
* commit '5ab0e183abdd4008c5591011804d0bc770851a7f':
Hide optimization control on battery details page for non whitelisted apps.
2015-08-07 16:34:58 +00:00
Julia Reynolds
5ab0e183ab
Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
2015-08-07 16:29:41 +00:00
Geoff Mendal
75a77cc77d
am 233f1b61
: (-s ours) am 6540a972
: (-s ours) am 2d546b77
: (-s ours) Import translations. DO NOT MERGE
...
* commit '233f1b61ce627819adb4351eb0b2d78f3020a38d':
Import translations. DO NOT MERGE
2015-08-07 04:55:25 +00:00
Geoff Mendal
233f1b61ce
am 6540a972
: (-s ours) am 2d546b77
: (-s ours) Import translations. DO NOT MERGE
...
* commit '6540a97291a5217558e67e5ed4186a25fbd16145':
Import translations. DO NOT MERGE
2015-08-07 04:48:08 +00:00
Geoff Mendal
6540a97291
am 2d546b77
: (-s ours) Import translations. DO NOT MERGE
...
* commit '2d546b77b997376416e2ba22d5a01ef6da27cbb3':
Import translations. DO NOT MERGE
2015-08-07 04:44:05 +00:00
Geoff Mendal
2d546b77b9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 22879473
Bug: 22719051
Change-Id: Ic6f0352135604d3a4d02ecfc9713f21191b046fd
2015-08-07 04:21:22 +00:00
Andres Morales
ae560bf189
am 13d38763
: am d4c3dff6
: am 4897fa87
: Merge "fix CC for work profiles" into mnc-dev
...
* commit '13d387631f586d03a77aace9da9a991d5aea32ba':
fix CC for work profiles
2015-08-06 22:41:42 +00:00
Andres Morales
13d387631f
am d4c3dff6
: am 4897fa87
: Merge "fix CC for work profiles" into mnc-dev
...
* commit 'd4c3dff6e3f900ab5693c9406ea625c2e398f7ba':
fix CC for work profiles
2015-08-06 22:36:04 +00:00
Andres Morales
d4c3dff6e3
am 4897fa87
: Merge "fix CC for work profiles" into mnc-dev
...
* commit '4897fa87a55173f45bfddb2480a2e34eb412b8ef':
fix CC for work profiles
2015-08-06 22:30:55 +00:00
Andres Morales
4897fa87a5
Merge "fix CC for work profiles" into mnc-dev
2015-08-06 22:22:17 +00:00
Julia Reynolds
89a7a88124
Wrap text on long preferences.
...
Bug: 22987590
Change-Id: Iaef2c7d7d4581372a381d537f6d85a64d94bdf12
2015-08-06 14:23:47 -04:00
Julia Reynolds
2f01c5f5b5
Hide optimization control on battery details page for non whitelisted apps.
...
Bug: 22978210
Change-Id: If532960478dccf6ef9bea08a27167e1850749277
2015-08-06 11:42:40 -04:00
Geoff Mendal
79aed47747
am 05facd93
: (-s ours) am 18d86828
: (-s ours) am 7930f872
: (-s ours) Import translations. DO NOT MERGE
...
* commit '05facd935a44d882ca6f5e0ee7b3b1cffd1c0ad4':
Import translations. DO NOT MERGE
2015-08-06 04:32:56 +00:00
Geoff Mendal
05facd935a
am 18d86828
: (-s ours) am 7930f872
: (-s ours) Import translations. DO NOT MERGE
...
* commit '18d8682802460074f4b0e628bae4d4051d542c77':
Import translations. DO NOT MERGE
2015-08-06 04:24:45 +00:00
Geoff Mendal
870ba02933
am 40f6e9ab
: (-s ours) am 90c22976
: (-s ours) Import translations. DO NOT MERGE
...
* commit '40f6e9ab3ea41203d0ba1737713db58751e1995d':
Import translations. DO NOT MERGE
2015-08-06 04:24:30 +00:00
Geoff Mendal
40f6e9ab3e
am 90c22976
: (-s ours) Import translations. DO NOT MERGE
...
* commit '90c2297645341f347f56b160f06551963c64d039':
Import translations. DO NOT MERGE
2015-08-06 04:20:45 +00:00
Geoff Mendal
18d8682802
am 7930f872
: (-s ours) Import translations. DO NOT MERGE
...
* commit '7930f872ad6b3f0e27c41d848131204eac0cd705':
Import translations. DO NOT MERGE
2015-08-06 04:20:33 +00:00
Andres Morales
7bdffd85eb
fix CC for work profiles
...
Bug: 22257554
Change-Id: I09f62956d01f91d3014d9fa250aaff68ab5e1a9b
2015-08-05 19:57:51 -07:00
Geoff Mendal
90c2297645
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 22390723
Change-Id: I2098bcc385398b9e2ac2be40f18e98819d52dc7c
2015-08-05 18:24:49 -07:00
Geoff Mendal
7930f872ad
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 22390723
Change-Id: Ifa5940a4053147c433ff717d920c6f724b53affa
2015-08-05 18:15:07 -07:00
Jason Monk
854533a82d
am 5b12cb77
: am 150e60ca
: am 888673bd
: Hide show/hide system from battery optimizations list
...
* commit '5b12cb7712d85025c93ad941b0694916c0566a37':
Hide show/hide system from battery optimizations list
2015-08-05 20:44:41 +00:00
Jason Monk
5b12cb7712
am 150e60ca
: am 888673bd
: Hide show/hide system from battery optimizations list
...
* commit '150e60ca9ad594d36aa12b425836a7d61b68501c':
Hide show/hide system from battery optimizations list
2015-08-05 20:37:17 +00:00
Jason Monk
150e60ca9a
am 888673bd
: Hide show/hide system from battery optimizations list
...
* commit '888673bd51acf9263163acfebdd0680358deabaa':
Hide show/hide system from battery optimizations list
2015-08-05 20:30:40 +00:00
Sanket Padawe
95a524a4ff
am eb04b01b
: am ac02e250
: am 151612fb
: am 5f9d15ed
: am 86d85300
: am 19336da3
: am ac2347c0
: am 158fa952
: am df9b13af
: am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit 'eb04b01b3ffc44f6dec1a7d24228fcd4ab6116ee':
Check for special char when renaming device for Wi-Fi direct.
2015-08-05 20:27:24 +00:00
Sanket Padawe
eb04b01b3f
am ac02e250
: am 151612fb
: am 5f9d15ed
: am 86d85300
: am 19336da3
: am ac2347c0
: am 158fa952
: am df9b13af
: am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit 'ac02e250c1540c85c29e0ae753cb365c155c2968':
Check for special char when renaming device for Wi-Fi direct.
2015-08-05 20:20:47 +00:00
Sanket Padawe
ac02e250c1
am 151612fb
: am 5f9d15ed
: am 86d85300
: am 19336da3
: am ac2347c0
: am 158fa952
: am df9b13af
: am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit '151612fb0de35fd2fadb096511f108b433100149':
Check for special char when renaming device for Wi-Fi direct.
2015-08-05 20:12:00 +00:00
Jason Monk
888673bd51
Hide show/hide system from battery optimizations list
...
Bug: 22977820
Change-Id: I1741bfe3e8703bae8ce10503879adfd12e9eb4fc
2015-08-05 16:08:00 -04:00
Sanket Padawe
151612fb0d
am 5f9d15ed
: am 86d85300
: am 19336da3
: am ac2347c0
: am 158fa952
: am df9b13af
: am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit '5f9d15ed252e0870097533bd75a759f28f2bda0d':
Check for special char when renaming device for Wi-Fi direct.
2015-08-05 20:07:15 +00:00
Sanket Padawe
5f9d15ed25
am 86d85300
: am 19336da3
: am ac2347c0
: am 158fa952
: am df9b13af
: am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit '86d853000feca5a627ef87760cdd7df3c3aea1bb':
Check for special char when renaming device for Wi-Fi direct.
2015-08-05 18:28:12 +00:00