OSDN Git Service
Julia Reynolds [Mon, 17 Aug 2015 17:26:19 +0000 (17:26 +0000)]
am
0ece6a32: String update for battery details page.
* commit '
0ece6a3241062842db991ad63add899369ce1853':
String update for battery details page.
Julia Reynolds [Mon, 17 Aug 2015 17:14:38 +0000 (13:14 -0400)]
String update for battery details page.
Bug:
22978210
Change-Id: I87d231868d6116c3f0d88a6a6d3ca5fac1ce8c90
Chris Wren [Mon, 17 Aug 2015 16:47:56 +0000 (16:47 +0000)]
Merge "instrument fingerprint settings" into mnc-dr-dev
Jason Monk [Mon, 17 Aug 2015 15:29:52 +0000 (15:29 +0000)]
Merge "Fix Usb-C dialog issues" into mnc-dr-dev
Geoff Mendal [Mon, 17 Aug 2015 14:05:00 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic048bcec759963a76125600eb86b952a2aec5759
Auto-generated-cl: translation import
Chris Wren [Fri, 14 Aug 2015 19:42:02 +0000 (15:42 -0400)]
instrument fingerprint settings
instrument visibility on all fingerprint views
rename and delete action
add fingerprint action is implicit in flow
Bug:
22951001
Change-Id: I53f048f479e24754972b801598d5da393ba9d716
Adam Lesinski [Fri, 14 Aug 2015 19:43:40 +0000 (19:43 +0000)]
am
3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
* commit '
3cc05c9d7e290b7e6ff10c3428c471b8e2529f2c':
BatteryStats: Fix coalescing of shared app GIDs and system UIDs
Adam Lesinski [Fri, 14 Aug 2015 19:38:34 +0000 (19:38 +0000)]
Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 18:29:15 +0000 (18:29 +0000)]
am
b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
* commit '
b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61':
Only offer migration between private volumes.
Jeff Sharkey [Fri, 14 Aug 2015 18:23:39 +0000 (18:23 +0000)]
Merge "Only offer migration between private volumes." into mnc-dev
Chris Tate [Fri, 14 Aug 2015 17:20:18 +0000 (17:20 +0000)]
am
7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '
7e36d33c00458a5f74b69963723c6e06f3f6ccf3':
Make "Ask every time" actually work that way
Chris Tate [Fri, 14 Aug 2015 17:11:48 +0000 (17:11 +0000)]
Merge "Make "Ask every time" actually work that way" into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 16:46:03 +0000 (09:46 -0700)]
Only offer migration between private volumes.
Without this change, there is a confusing option to migrate a public
SD card volume to internal storage, which will always fail if the
user picks it, since it's not supported under the hood.
Bug:
22966671
Change-Id: Id7cad07eea6583aace398a6d64383bf7d884ae9e
Adam Lesinski [Thu, 13 Aug 2015 23:56:30 +0000 (16:56 -0700)]
BatteryStats: Fix coalescing of shared app GIDs and system UIDs
UIDs that consumed power and were actually shared app GIDs are now
coelsced for system apps as well as regular applications. In addition,
system UIDs like logd, NFC, DRM, etc are coalesced into Android System.
Bug:
23189342
Change-Id: I6c8eb4baec66fba3d1f71a155d8ea1fe920ffec9
Jeff Sharkey [Fri, 14 Aug 2015 01:24:41 +0000 (01:24 +0000)]
am
ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
* commit '
ae531f1f613fb1a94fade18e5e92fc842a2a9016':
Show storage slow dialog allowing state loss.
Jeff Sharkey [Fri, 14 Aug 2015 01:18:18 +0000 (01:18 +0000)]
Merge "Show storage slow dialog allowing state loss." into mnc-dev
Jeff Sharkey [Thu, 13 Aug 2015 23:57:46 +0000 (16:57 -0700)]
Show storage slow dialog allowing state loss.
We're not picky about losing state here, since the adoption actually
finished under the hood and we're just warning the user that it's
slow.
Without this change, we could end up throwing and re-adopting the
same device twice, which causes issues on sprout-style devices that
only migrate primary storage once.
Bug:
22867250
Change-Id: I1491679ab802f19fe25b82e9b452ca3dabdfec0d
Christopher Tate [Thu, 13 Aug 2015 23:34:10 +0000 (16:34 -0700)]
Make "Ask every time" actually work that way
..in link-opening behavior. If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.
Bug
23147746
Change-Id: I73d8893ab74ea0356b757ab836349243cda2e307
Geoff Mendal [Thu, 13 Aug 2015 04:59:17 +0000 (04:59 +0000)]
am
eea96f22: (-s ours) Import translations. DO NOT MERGE
* commit '
eea96f22a1ec156d78374f49352341c46c219ca0':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 13 Aug 2015 04:50:09 +0000 (21:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
23037720
Change-Id: I2349611e7f02b8e06ac12a4c86573711c6ff6a0e
Jorim Jaggi [Thu, 13 Aug 2015 01:18:03 +0000 (01:18 +0000)]
Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
Jorim Jaggi [Tue, 11 Aug 2015 01:11:07 +0000 (18:11 -0700)]
Wait with finishing until fingerprints are removed
Bug:
22863210
Change-Id: I490157cc2f9b52ac87cc52e13c7eb57cb4a4a377
Dianne Hackborn [Thu, 13 Aug 2015 00:54:31 +0000 (00:54 +0000)]
am
f67d0785: Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
* commit '
f67d0785d006677d2fba3f2192f3f6ea824c5336':
Fix issue #
23116383: Include security patch level in Settings
Dianne Hackborn [Thu, 13 Aug 2015 00:46:58 +0000 (00:46 +0000)]
Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
Dianne Hackborn [Wed, 12 Aug 2015 23:11:46 +0000 (16:11 -0700)]
Fix issue #
23116383: Include security patch level in Settings
Change-Id: I003564376a02a70f0245353472544cde355240ac
Jason Monk [Wed, 12 Aug 2015 18:14:33 +0000 (14:14 -0400)]
Fix Usb-C dialog issues
- Fix theme
- Fix PTP bug introduced in initial USB-C support
Bug:
21615151
Change-Id: I577f06929b028fe3f50ef5b9adcfa9507fd1df0e
Sanket Padawe [Wed, 12 Aug 2015 17:17:31 +0000 (17:17 +0000)]
Merge "Avoid sending identity along with EAP sim, aka & aka'." into mnc-dr-dev
Geoff Mendal [Wed, 12 Aug 2015 14:00:45 +0000 (07:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id1b064096c8580892f747af1c02e46ad5b897671
Auto-generated-cl: translation import
Sanket Padawe [Wed, 12 Aug 2015 01:42:36 +0000 (18:42 -0700)]
Avoid sending identity along with EAP sim, aka & aka'.
Bug:
22358498
Change-Id: I829b3f9fe688efc933483506e1b5944195e1975f
Andres Morales [Tue, 11 Aug 2015 23:35:59 +0000 (23:35 +0000)]
am
9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
* commit '
9f879ef009863a0674e891ad0e51b1b216da5beb':
[ConfirmPattern] use correct user id for stealth mode
Andres Morales [Tue, 11 Aug 2015 23:31:23 +0000 (23:31 +0000)]
Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
Dianne Hackborn [Tue, 11 Aug 2015 23:26:45 +0000 (23:26 +0000)]
am
8500822b: Merge "Fix issue #
23079119: Description for write settings permission says..." into mnc-dev
* commit '
8500822b8e39473e272a0c4e84349aa9dadf763f':
Fix issue #
23079119: Description for write settings permission says...
Dianne Hackborn [Tue, 11 Aug 2015 23:17:24 +0000 (23:17 +0000)]
Merge "Fix issue #
23079119: Description for write settings permission says..." into mnc-dev
Andres Morales [Tue, 11 Aug 2015 23:12:50 +0000 (16:12 -0700)]
[ConfirmPattern] use correct user id for stealth mode
Bug:
23027554
Change-Id: I9582dab3a0355f613d0ce1c943b0eeba2694dddd
Maurice Lam [Tue, 11 Aug 2015 22:43:35 +0000 (22:43 +0000)]
am
3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
* commit '
3d9cb9261849d8178ce834c8216fe2154db4e5af':
[Fingerprint] Use different ring size for setup
Maurice Lam [Tue, 11 Aug 2015 22:35:53 +0000 (22:35 +0000)]
Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
Paul Lawrence [Tue, 11 Aug 2015 22:20:53 +0000 (22:20 +0000)]
Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev
Paul Lawrence [Mon, 3 Aug 2015 16:44:23 +0000 (09:44 -0700)]
Gray out confirm button on pattern/pin/password set dialog
Setting a pin/pattern/password can take a second. Gray out the confirm
button to avoid multiple submissions.
Note that this requires async tasks so that the button is shown as gray
in a timely way.
Also don't add another stage - this causes a11y to repeat the title.
Bug:
22882174
Change-Id: Ib8047fde9e12afa25e82ebfa3a1e799a4b7043f2
Dianne Hackborn [Tue, 11 Aug 2015 19:17:59 +0000 (12:17 -0700)]
Fix issue #
23079119: Description for write settings permission says...
...it is for read and write
Just write.
And let's say, modify.
Change-Id: If901bab36888674d5a6e8c5979ec190b64aff18e
Jason Monk [Tue, 11 Aug 2015 13:55:54 +0000 (13:55 +0000)]
Merge "Add setting to disable camera gesture" into mnc-dr-dev
Dianne Hackborn [Tue, 11 Aug 2015 00:19:40 +0000 (00:19 +0000)]
am
be4df036: Fix issue #
23037899: Support for Battery Optimization permission + Dialog
* commit '
be4df036e1c688a1b7a5fc9d4ab18f09729296b3':
Fix issue #
23037899: Support for Battery Optimization permission + Dialog
Dianne Hackborn [Tue, 11 Aug 2015 00:11:09 +0000 (00:11 +0000)]
am
ba38155d: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
ba38155d257aa00e0dabb9cf9eefc1a281278a14':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Mon, 10 Aug 2015 21:53:33 +0000 (14:53 -0700)]
Fix issue #
23037899: Support for Battery Optimization permission + Dialog
New pretty dialog.
Change-Id: I6094b83139beffc407b01049a0d9d1f85a95df07
Dianne Hackborn [Tue, 11 Aug 2015 00:06:43 +0000 (00:06 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Dianne Hackborn [Tue, 11 Aug 2015 00:03:38 +0000 (17:03 -0700)]
Fix issue #
23037720: New Battery Optimization Strings
No, really, these are the strings.
Change-Id: Ibe94b5251934a1d855974d846f3de6bdb314c7e9
Dianne Hackborn [Mon, 10 Aug 2015 22:02:23 +0000 (22:02 +0000)]
am
996e285c: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
996e285cdcd26ee7251ec80915eeed57541efb6d':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Mon, 10 Aug 2015 21:55:23 +0000 (21:55 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Julia Reynolds [Mon, 10 Aug 2015 20:37:34 +0000 (20:37 +0000)]
am
2557d8a2: Merge "Wrap text on long preferences." into mnc-dev
* commit '
2557d8a25124b93801bc5de1b1b2d063cad1c3ff':
Wrap text on long preferences.
Julia Reynolds [Mon, 10 Aug 2015 20:32:49 +0000 (20:32 +0000)]
Merge "Wrap text on long preferences." into mnc-dev
Jason Monk [Mon, 10 Aug 2015 20:14:46 +0000 (20:14 +0000)]
am
cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
* commit '
cf1e22f4471f39f4cf3c134006ecf9ffedb91e36':
Remove extra help & feedback menu from power usage
Jason Monk [Mon, 10 Aug 2015 20:09:20 +0000 (20:09 +0000)]
Merge "Remove extra help & feedback menu from power usage" into mnc-dev
Jason Monk [Mon, 10 Aug 2015 19:58:09 +0000 (15:58 -0400)]
Remove extra help & feedback menu from power usage
Bug:
23044354
Change-Id: Ic722655a50eddbf4f8e53a2b73ed49b5cf6426a4
Pavel Zhamaitsiak [Mon, 10 Aug 2015 17:35:16 +0000 (17:35 +0000)]
am
8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev
* commit '
8cf54264995aea65d77c25b5050cb3aac0196c59':
Ensure that listener is removed only if it was added
Pavel Zhamaitsiak [Mon, 10 Aug 2015 17:29:38 +0000 (17:29 +0000)]
Merge "Ensure that listener is removed only if it was added" into mnc-dev
Geoff Mendal [Mon, 10 Aug 2015 14:03:46 +0000 (07:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: If91d4ed788fe61f16f68cdc2fb8c1d1a6ca39721
Auto-generated-cl: translation import
Geoff Mendal [Sat, 8 Aug 2015 14:26:58 +0000 (07:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I49911941b08daff0dce1d0ec3ca9b21ae209650b
Auto-generated-cl: translation import
Jeff Sharkey [Fri, 7 Aug 2015 23:51:57 +0000 (23:51 +0000)]
am
67f0739c: Merge "Block moving when already in progress." into mnc-dev
* commit '
67f0739ca3a81515975856b09d216debfd090ae9':
Block moving when already in progress.
Jeff Sharkey [Fri, 7 Aug 2015 23:38:44 +0000 (23:38 +0000)]
Merge "Block moving when already in progress." into mnc-dev
Jeff Sharkey [Fri, 7 Aug 2015 22:59:28 +0000 (15:59 -0700)]
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
Billy Lau [Fri, 7 Aug 2015 22:22:19 +0000 (22:22 +0000)]
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
Billy Lau [Fri, 7 Aug 2015 22:15:32 +0000 (22:15 +0000)]
Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 22:05:56 +0000 (22:05 +0000)]
am
e7a5966a: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
e7a5966aa72a7a64358e4092fa3fe2b46b28c420':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Fri, 7 Aug 2015 21:58:52 +0000 (21:58 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 21:38:06 +0000 (14:38 -0700)]
Fix issue #
23037720: New Battery Optimization Strings
Thar be strings.
Change-Id: Ieb43d041912cc5d2cc181d3232e01dbfce6cbc0e
Dianne Hackborn [Fri, 7 Aug 2015 21:38:06 +0000 (14:38 -0700)]
Fix issue #
23037720: New Battery Optimization Strings
There be strings.
Change-Id: I92d4bd64f36f7d186a383178d55fbff26078509c
Pavel Zhamaitsiak [Fri, 7 Aug 2015 19:02:38 +0000 (12:02 -0700)]
Ensure that listener is removed only if it was added
Bug:
23016088
Change-Id: Ia6f17739ffc841ce8483e9c6c8132a94ecd62200
Maurice Lam [Wed, 5 Aug 2015 04:29:07 +0000 (21:29 -0700)]
[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
Julia Reynolds [Fri, 7 Aug 2015 16:34:58 +0000 (16:34 +0000)]
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.
Julia Reynolds [Fri, 7 Aug 2015 16:29:41 +0000 (16:29 +0000)]
Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
Geoff Mendal [Fri, 7 Aug 2015 04:44:05 +0000 (04:44 +0000)]
am
2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit '
2d546b77b997376416e2ba22d5a01ef6da27cbb3':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 7 Aug 2015 04:20:12 +0000 (21:20 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22879473
Bug:
22719051
Change-Id: Ic6f0352135604d3a4d02ecfc9713f21191b046fd
Andres Morales [Thu, 6 Aug 2015 22:30:55 +0000 (22:30 +0000)]
am
4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit '
4897fa87a55173f45bfddb2480a2e34eb412b8ef':
fix CC for work profiles
Andres Morales [Thu, 6 Aug 2015 22:22:17 +0000 (22:22 +0000)]
Merge "fix CC for work profiles" into mnc-dev
Julia Reynolds [Thu, 6 Aug 2015 18:21:31 +0000 (14:21 -0400)]
Wrap text on long preferences.
Bug:
22987590
Change-Id: Iaef2c7d7d4581372a381d537f6d85a64d94bdf12
Julia Reynolds [Thu, 6 Aug 2015 14:54:44 +0000 (10:54 -0400)]
Hide optimization control on battery details page for non whitelisted apps.
Bug:
22978210
Change-Id: If532960478dccf6ef9bea08a27167e1850749277
Geoff Mendal [Thu, 6 Aug 2015 04:20:33 +0000 (04:20 +0000)]
am
7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '
7930f872ad6b3f0e27c41d848131204eac0cd705':
Import translations. DO NOT MERGE
Andres Morales [Tue, 4 Aug 2015 23:55:00 +0000 (16:55 -0700)]
fix CC for work profiles
Bug:
22257554
Change-Id: I09f62956d01f91d3014d9fa250aaff68ab5e1a9b
Geoff Mendal [Thu, 6 Aug 2015 01:24:49 +0000 (18:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22390723
Change-Id: I2098bcc385398b9e2ac2be40f18e98819d52dc7c
Geoff Mendal [Thu, 6 Aug 2015 01:15:07 +0000 (18:15 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22390723
Change-Id: Ifa5940a4053147c433ff717d920c6f724b53affa
Jason Monk [Wed, 5 Aug 2015 20:30:40 +0000 (20:30 +0000)]
am
888673bd: Hide show/hide system from battery optimizations list
* commit '
888673bd51acf9263163acfebdd0680358deabaa':
Hide show/hide system from battery optimizations list
Sanket Padawe [Wed, 5 Aug 2015 20:12:00 +0000 (20:12 +0000)]
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.
Jason Monk [Wed, 5 Aug 2015 20:06:19 +0000 (16:06 -0400)]
Hide show/hide system from battery optimizations list
Bug:
22977820
Change-Id: I1741bfe3e8703bae8ce10503879adfd12e9eb4fc
Sanket Padawe [Wed, 5 Aug 2015 20:07:15 +0000 (20:07 +0000)]
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.
Sanket Padawe [Wed, 5 Aug 2015 18:28:12 +0000 (18:28 +0000)]
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.
Ajay Panicker [Wed, 5 Aug 2015 18:01:14 +0000 (18:01 +0000)]
am
cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
* commit '
cd8acb2256ca37ac4d1b71c513bac4e541c67c6d':
Implement Bluetooth settings factory reset (5/5)
Ajay Panicker [Wed, 5 Aug 2015 17:49:08 +0000 (17:49 +0000)]
Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
Jason Monk [Wed, 5 Aug 2015 16:48:13 +0000 (16:48 +0000)]
am
244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
* commit '
244fd78205827d6c77367c2a46dca661d85a6d98':
Remove summaries fro configure apps page
Jason Monk [Wed, 5 Aug 2015 14:34:14 +0000 (14:34 +0000)]
Merge "Remove summaries fro configure apps page" into mnc-dev
Geoff Mendal [Wed, 5 Aug 2015 14:05:39 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib3414d2601d5e614e1a25823c238e8f124fc8e11
Auto-generated-cl: translation import
Maurice Lam [Wed, 5 Aug 2015 00:46:11 +0000 (00:46 +0000)]
am
311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
* commit '
311a2d952522eb61a513670a32462d22504401b1':
[Fingerprint] Update string for enrolling
Maurice Lam [Wed, 5 Aug 2015 00:38:37 +0000 (00:38 +0000)]
Merge "[Fingerprint] Update string for enrolling" into mnc-dev
Maurice Lam [Wed, 5 Aug 2015 00:20:06 +0000 (00:20 +0000)]
am
8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit '
8c9136efceaec05663ac9f655e7e9c7cceb3ac2a':
[Fingerprint] Shrink fingerprint progress ring
Maurice Lam [Wed, 5 Aug 2015 00:09:32 +0000 (00:09 +0000)]
Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
Maurice Lam [Tue, 4 Aug 2015 22:19:56 +0000 (15:19 -0700)]
[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
Maurice Lam [Tue, 4 Aug 2015 22:19:56 +0000 (15:19 -0700)]
[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
Billy Lau [Sat, 1 Aug 2015 17:12:33 +0000 (18:12 +0100)]
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
Ajay Panicker [Wed, 29 Jul 2015 18:39:16 +0000 (11:39 -0700)]
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
Maurice Lam [Tue, 4 Aug 2015 22:05:23 +0000 (15:05 -0700)]
[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
Jason Monk [Tue, 4 Aug 2015 20:23:32 +0000 (16:23 -0400)]
resolved conflicts for merge of
1adca55f to mnc-dr-dev
Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
Nick Kralevich [Tue, 4 Aug 2015 19:45:58 +0000 (19:45 +0000)]
Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
OSDN Git Service
