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
Ajay Panicker
21eff785a7
am e396c224
: am f1ffec39
: am 1dd985ab
: am cd8acb22
: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
...
* commit 'e396c2241ff629bcfd60bd3caf3fe2da7637dee6':
Implement Bluetooth settings factory reset (5/5)
2015-08-05 18:43:17 +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
Ajay Panicker
e396c2241f
am f1ffec39
: am 1dd985ab
: am cd8acb22
: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
...
* commit 'f1ffec39b64d85b361f7814690fd5eec0a176f51':
Implement Bluetooth settings factory reset (5/5)
2015-08-05 18:26:05 +00:00
Ajay Panicker
f1ffec39b6
am 1dd985ab
: am cd8acb22
: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
...
* commit '1dd985abdc5e2a04cf97b4dce778db89891e5064':
Implement Bluetooth settings factory reset (5/5)
2015-08-05 18:16:29 +00:00
Ajay Panicker
1dd985abdc
am cd8acb22
: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
...
* commit 'cd8acb2256ca37ac4d1b71c513bac4e541c67c6d':
Implement Bluetooth settings factory reset (5/5)
2015-08-05 18:01:14 +00:00
Ajay Panicker
cd8acb2256
Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
2015-08-05 17:49:08 +00:00
Jason Monk
852d58b924
am ca26f032
: am 4734d829
: am 6be055a8
: am c86f6dfd
: am 244fd782
: Merge "Remove summaries fro configure apps page" into mnc-dev
...
* commit 'ca26f0327c97cb799b4b1348b20424f6a5227d08':
Remove summaries fro configure apps page
2015-08-05 17:32:41 +00:00
Jason Monk
ca26f0327c
am 4734d829
: am 6be055a8
: am c86f6dfd
: am 244fd782
: Merge "Remove summaries fro configure apps page" into mnc-dev
...
* commit '4734d829cd72acc70f24af88a3780c29d410af2d':
Remove summaries fro configure apps page
2015-08-05 17:26:03 +00:00
Jason Monk
4734d829cd
am 6be055a8
: am c86f6dfd
: am 244fd782
: Merge "Remove summaries fro configure apps page" into mnc-dev
...
* commit '6be055a83dc6a70bbce04774b1725c8696abb1fa':
Remove summaries fro configure apps page
2015-08-05 17:09:10 +00:00
Jason Monk
6be055a83d
am c86f6dfd
: am 244fd782
: Merge "Remove summaries fro configure apps page" into mnc-dev
...
* commit 'c86f6dfdc83d1c6c1115dccc9db9d8073587036d':
Remove summaries fro configure apps page
2015-08-05 17:01:02 +00:00
Jason Monk
c86f6dfdc8
am 244fd782
: Merge "Remove summaries fro configure apps page" into mnc-dev
...
* commit '244fd78205827d6c77367c2a46dca661d85a6d98':
Remove summaries fro configure apps page
2015-08-05 16:48:13 +00:00
Geoff Mendal
452e64e7ce
am ea3f0326
: (-s ours) am ea1724e2
: (-s ours) am 38911d7a
: (-s ours) am 093f3746
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ea3f0326b3043cf6672c9fbeb77c768b81a06e3d':
Import translations. DO NOT MERGE
2015-08-05 14:50:18 +00:00
Geoff Mendal
ea3f0326b3
am ea1724e2
: (-s ours) am 38911d7a
: (-s ours) am 093f3746
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ea1724e2c1a94a061ee1b98fea79d88ae1ae2150':
Import translations. DO NOT MERGE
2015-08-05 14:44:44 +00:00
Geoff Mendal
ea1724e2c1
am 38911d7a
: (-s ours) am 093f3746
: (-s ours) Import translations. DO NOT MERGE
...
* commit '38911d7a719483ab5f3a7ea18608774183229091':
Import translations. DO NOT MERGE
2015-08-05 14:38:27 +00:00
Jason Monk
244fd78205
Merge "Remove summaries fro configure apps page" into mnc-dev
2015-08-05 14:34:14 +00:00
Geoff Mendal
38911d7a71
am 093f3746
: (-s ours) Import translations. DO NOT MERGE
...
* commit '093f37469ae513c273b5d1ab44793f1041888676':
Import translations. DO NOT MERGE
2015-08-05 14:30:37 +00:00
Geoff Mendal
093f37469a
Import translations. DO NOT MERGE
...
Change-Id: Ib3414d2601d5e614e1a25823c238e8f124fc8e11
Auto-generated-cl: translation import
2015-08-05 07:05:39 -07:00
Geoff Mendal
583100e5b2
Import translations. DO NOT MERGE
...
Change-Id: I8f44336535f1b0068d2d4da91070e965f400bfe7
Auto-generated-cl: translation import
2015-08-05 06:14:46 -07:00
Maurice Lam
b2b13c6f39
am a69dc8ee
: am 944233e2
: am 5a079608
: am 596a8a3c
: am 311a2d95
: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
...
* commit 'a69dc8eea11e9097d7589f684e57e596135c87d4':
[Fingerprint] Update string for enrolling
2015-08-05 01:20:41 +00:00
Maurice Lam
a69dc8eea1
am 944233e2
: am 5a079608
: am 596a8a3c
: am 311a2d95
: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
...
* commit '944233e2521e3f92af92fe6af8c02780340724a7':
[Fingerprint] Update string for enrolling
2015-08-05 01:11:25 +00:00
Maurice Lam
944233e252
am 5a079608
: am 596a8a3c
: am 311a2d95
: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
...
* commit '5a07960889ca3c393e682c9ca1bbc2dff276ef1d':
[Fingerprint] Update string for enrolling
2015-08-05 01:05:42 +00:00
Maurice Lam
5a07960889
am 596a8a3c
: am 311a2d95
: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
...
* commit '596a8a3c0ac4e931c52e3f4b391d4d4dca1fdcf6':
[Fingerprint] Update string for enrolling
2015-08-05 00:56:58 +00:00
Maurice Lam
70d6cdcae2
am c4ea9b29
: am c781bf30
: am e8f7ed9e
: am 2a74b862
: am 8c9136ef
: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
...
* commit 'c4ea9b29c85837fdbe63a3089338137fd448d79d':
[Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:51:45 +00:00
Maurice Lam
596a8a3c0a
am 311a2d95
: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
...
* commit '311a2d952522eb61a513670a32462d22504401b1':
[Fingerprint] Update string for enrolling
2015-08-05 00:46:11 +00:00
Maurice Lam
c4ea9b29c8
am c781bf30
: am e8f7ed9e
: am 2a74b862
: am 8c9136ef
: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
...
* commit 'c781bf30ad0a10217fa74dbb5a2f61ab165d8b3f':
[Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:44:00 +00:00
Maurice Lam
311a2d9525
Merge "[Fingerprint] Update string for enrolling" into mnc-dev
2015-08-05 00:38:37 +00:00
Maurice Lam
c781bf30ad
am e8f7ed9e
: am 2a74b862
: am 8c9136ef
: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
...
* commit 'e8f7ed9ea0ece56f58d5ea187ec00f01da54a2bf':
[Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:35:27 +00:00
Maurice Lam
e8f7ed9ea0
am 2a74b862
: am 8c9136ef
: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
...
* commit '2a74b8623816b961f3da7f45f080e61067f951e6':
[Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:27:22 +00:00
Maurice Lam
2a74b86238
am 8c9136ef
: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
...
* commit '8c9136efceaec05663ac9f655e7e9c7cceb3ac2a':
[Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:20:06 +00:00
Maurice Lam
8c9136efce
Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
2015-08-05 00:09:32 +00:00
Maurice Lam
ac663863e5
am 177cebf7
: am 54a34ac6
: am 6eb6f924
: am c48ea1f5
: [Fingerprint] Update string for enrolling
...
* commit '177cebf7e32632bb493fab0f157f7fe4827c0572':
[Fingerprint] Update string for enrolling
2015-08-04 23:56:34 +00:00
Maurice Lam
177cebf7e3
am 54a34ac6
: am 6eb6f924
: am c48ea1f5
: [Fingerprint] Update string for enrolling
...
* commit '54a34ac6f92577b95fb42ba9c55a230c68f80076':
[Fingerprint] Update string for enrolling
2015-08-04 23:47:51 +00:00
Maurice Lam
54a34ac6f9
am 6eb6f924
: am c48ea1f5
: [Fingerprint] Update string for enrolling
...
* commit '6eb6f924ac02afa004ea15ccbeecdd16c152b222':
[Fingerprint] Update string for enrolling
2015-08-04 23:43:00 +00:00
Maurice Lam
6eb6f924ac
am c48ea1f5
: [Fingerprint] Update string for enrolling
...
* commit 'c48ea1f5864b8f4d58eebd28173cff655193c70a':
[Fingerprint] Update string for enrolling
2015-08-04 23:36:09 +00:00
Maurice Lam
c48ea1f586
[Fingerprint] Update string for enrolling
...
Update string for enrolling to tell the user to move their fingers,
so that different parts of their fingerprints can be captured.
Also include other minor update to strings mentioned in the bug.
Bug: 22719051
Change-Id: Idd3c69d4476d240c9ef81e8c82b7ae9fcb390a41
2015-08-04 23:08:10 +00:00
Maurice Lam
289151ccea
[Fingerprint] Update string for enrolling
...
Update string for enrolling to tell the user to move their fingers,
so that different parts of their fingerprints can be captured.
Also include other minor update to strings mentioned in the bug.
Bug: 22719051
Change-Id: Idd3c69d4476d240c9ef81e8c82b7ae9fcb390a41
2015-08-04 15:44:42 -07:00
Billy Lau
3d9c7fc998
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
...
Change the implementation of AppStateAppOpsBridge to handle multiple
requested permissions in one operation due to the merging of
CHANGE_NETWORK_STATE permission with WRITE_SETTINGS.
This change will affect the packages that will be listed under the
"Write system settings" option in Settings->Apps->[Gear/Cog].
Change-Id: I7d2304d2846b6f505a7b1c3fcf53e7a9bd184ed5
2015-08-04 23:44:36 +01:00
Ajay Panicker
568d9336ba
Implement Bluetooth settings factory reset (5/5)
...
Implemented the factory reset function to be used to reset all bluetooth
settings on device to factory default
Bug: 16161518
Change-Id: Ie5404a4547fcf747a0bb51d515e0c97628416f4b
2015-08-04 15:28:16 -07:00
Maurice Lam
42b6ad595b
[Fingerprint] Shrink fingerprint progress ring
...
Make the fingerprint progress ring smaller so that the error message
can be seen on Nexus 5 during setup.
Bug: 22924280
Change-Id: Ic8a70e1fa6f2dd33d1c7c239e32d3eb3a92cc187
2015-08-04 15:06:26 -07:00
Jason Monk
b3e81e1004
am 183fcd53
: am ddb22778
: am bd776a0b
: am 9824c5da
: resolved conflicts for merge of 1adca55f
to mnc-dr-dev
...
* commit '183fcd537023ef0e26cb6cd98d7cda48fdf12f20':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 21:10:14 +00:00
Jason Monk
183fcd5370
am ddb22778
: am bd776a0b
: am 9824c5da
: resolved conflicts for merge of 1adca55f
to mnc-dr-dev
...
* commit 'ddb22778100345a5a7bb00153e8e2f5b580c0d24':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 21:03:38 +00:00
Jason Monk
ddb2277810
am bd776a0b
: am 9824c5da
: resolved conflicts for merge of 1adca55f
to mnc-dr-dev
...
* commit 'bd776a0bb70b1956e3b7332fb75378df85b04a60':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 20:55:37 +00:00
Jason Monk
bd776a0bb7
am 9824c5da
: resolved conflicts for merge of 1adca55f
to mnc-dr-dev
...
* commit '9824c5da1efa9750fb19d477d29875a08289ecf5':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 20:43:01 +00:00
Jason Monk
9824c5da1e
resolved conflicts for merge of 1adca55f
to mnc-dr-dev
...
Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
2015-08-04 16:23:32 -04:00