Zachary Kuznia
5adcb3d353
Allow manual to be read from disk
...
b/22891924
Change-Id: I6014690735403b772f273addba01706441898e23
2015-08-17 18:20:37 -07:00
Julia Reynolds
62fdd5581e
am 0ece6a32
: String update for battery details page.
...
* commit '0ece6a3241062842db991ad63add899369ce1853':
String update for battery details page.
2015-08-17 17:26:19 +00:00
Julia Reynolds
0ece6a3241
String update for battery details page.
...
Bug: 22978210
Change-Id: I87d231868d6116c3f0d88a6a6d3ca5fac1ce8c90
2015-08-17 13:14:38 -04:00
Chris Wren
15ff8af7a7
Merge "instrument fingerprint settings" into mnc-dr-dev
2015-08-17 16:47:56 +00:00
Jason Monk
9d59a2441e
Merge "Fix Usb-C dialog issues" into mnc-dr-dev
2015-08-17 15:29:52 +00:00
Geoff Mendal
3c27420773
Import translations. DO NOT MERGE
...
Change-Id: Ic048bcec759963a76125600eb86b952a2aec5759
Auto-generated-cl: translation import
2015-08-17 07:05:00 -07:00
Chris Wren
1b8d5ffb47
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
2015-08-14 15:44:16 -04:00
Adam Lesinski
e3ddd117a6
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
2015-08-14 19:43:40 +00:00
Adam Lesinski
3cc05c9d7e
Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
2015-08-14 19:38:34 +00:00
Jeff Sharkey
82fee7bd0a
am b4158f0e
: Merge "Only offer migration between private volumes." into mnc-dev
...
* commit 'b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61':
Only offer migration between private volumes.
2015-08-14 18:29:15 +00:00
Jeff Sharkey
b4158f0e15
Merge "Only offer migration between private volumes." into mnc-dev
2015-08-14 18:23:39 +00:00
Chris Tate
36e2d32dab
am 7e36d33c
: Merge "Make "Ask every time" actually work that way" into mnc-dev
...
* commit '7e36d33c00458a5f74b69963723c6e06f3f6ccf3':
Make "Ask every time" actually work that way
2015-08-14 17:20:18 +00:00
Chris Tate
7e36d33c00
Merge "Make "Ask every time" actually work that way" into mnc-dev
2015-08-14 17:11:48 +00:00
Jeff Sharkey
6f52ed3332
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
2015-08-14 09:46:03 -07:00
Adam Lesinski
8f743471d5
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
2015-08-13 22:12:47 -07:00
Jeff Sharkey
c73287b9db
am ae531f1f
: Merge "Show storage slow dialog allowing state loss." into mnc-dev
...
* commit 'ae531f1f613fb1a94fade18e5e92fc842a2a9016':
Show storage slow dialog allowing state loss.
2015-08-14 01:24:41 +00:00
Jeff Sharkey
ae531f1f61
Merge "Show storage slow dialog allowing state loss." into mnc-dev
2015-08-14 01:18:18 +00:00
Jeff Sharkey
0814827e8f
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
2015-08-13 16:57:48 -07:00
Christopher Tate
970291e20c
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
2015-08-13 16:34:10 -07:00
Geoff Mendal
8a12d17b09
am eea96f22
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'eea96f22a1ec156d78374f49352341c46c219ca0':
Import translations. DO NOT MERGE
2015-08-13 04:59:17 +00:00
Geoff Mendal
eea96f22a1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 23037720
Change-Id: I2349611e7f02b8e06ac12a4c86573711c6ff6a0e
2015-08-12 21:50:09 -07:00
Jorim Jaggi
5dd0e27fbb
Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
2015-08-13 01:18:03 +00:00
Jorim Jaggi
f92fbc1c49
Wait with finishing until fingerprints are removed
...
Bug: 22863210
Change-Id: I490157cc2f9b52ac87cc52e13c7eb57cb4a4a377
2015-08-12 18:12:58 -07:00
Dianne Hackborn
6a1e1e08a0
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
2015-08-13 00:54:31 +00:00
Dianne Hackborn
f67d0785d0
Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
2015-08-13 00:46:58 +00:00
Dianne Hackborn
b9a8e277d9
Fix issue #23116383 : Include security patch level in Settings
...
Change-Id: I003564376a02a70f0245353472544cde355240ac
2015-08-12 16:11:46 -07:00
Jason Monk
94e460fd45
Fix Usb-C dialog issues
...
- Fix theme
- Fix PTP bug introduced in initial USB-C support
Bug: 21615151
Change-Id: I577f06929b028fe3f50ef5b9adcfa9507fd1df0e
2015-08-12 14:14:33 -04:00
Sanket Padawe
1d29bde1f5
Merge "Avoid sending identity along with EAP sim, aka & aka'." into mnc-dr-dev
2015-08-12 17:17:31 +00:00
Geoff Mendal
42ae7fba5b
Import translations. DO NOT MERGE
...
Change-Id: Id1b064096c8580892f747af1c02e46ad5b897671
Auto-generated-cl: translation import
2015-08-12 07:00:45 -07:00
Sanket Padawe
f1165c14c5
Avoid sending identity along with EAP sim, aka & aka'.
...
Bug: 22358498
Change-Id: I829b3f9fe688efc933483506e1b5944195e1975f
2015-08-11 18:42:36 -07:00
Andres Morales
a7bdde5885
am 9f879ef0
: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
...
* commit '9f879ef009863a0674e891ad0e51b1b216da5beb':
[ConfirmPattern] use correct user id for stealth mode
2015-08-11 23:35:59 +00:00
Andres Morales
9f879ef009
Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
2015-08-11 23:31:23 +00:00
Dianne Hackborn
e2e76435f4
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...
2015-08-11 23:26:45 +00:00
Dianne Hackborn
8500822b8e
Merge "Fix issue #23079119 : Description for write settings permission says..." into mnc-dev
2015-08-11 23:17:24 +00:00
Andres Morales
b56324b149
[ConfirmPattern] use correct user id for stealth mode
...
Bug: 23027554
Change-Id: I9582dab3a0355f613d0ce1c943b0eeba2694dddd
2015-08-11 23:17:17 +00:00
Maurice Lam
a430ac56b2
am 3d9cb926
: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
...
* commit '3d9cb9261849d8178ce834c8216fe2154db4e5af':
[Fingerprint] Use different ring size for setup
2015-08-11 22:43:35 +00:00
Maurice Lam
3d9cb92618
Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
2015-08-11 22:35:53 +00:00
Paul Lawrence
68f79718f7
Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev
2015-08-11 22:20:53 +00:00
Paul Lawrence
cff37ecbdd
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
2015-08-11 15:17:04 -07:00
Dianne Hackborn
4f8b829b24
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
2015-08-11 12:17:59 -07:00
Jason Monk
746886c59a
Merge "Add setting to disable camera gesture" into mnc-dr-dev
2015-08-11 13:55:54 +00:00
Dianne Hackborn
e9bcef3541
am be4df036
: Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
* commit 'be4df036e1c688a1b7a5fc9d4ab18f09729296b3':
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
2015-08-11 00:19:40 +00:00
Dianne Hackborn
fc7633cae2
am ba38155d
: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit 'ba38155d257aa00e0dabb9cf9eefc1a281278a14':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-11 00:11:09 +00:00
Dianne Hackborn
be4df036e1
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
New pretty dialog.
Change-Id: I6094b83139beffc407b01049a0d9d1f85a95df07
2015-08-10 17:07:14 -07:00
Dianne Hackborn
ba38155d25
Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
2015-08-11 00:06:43 +00:00
Dianne Hackborn
9bedd25c77
Fix issue #23037720 : New Battery Optimization Strings
...
No, really, these are the strings.
Change-Id: Ibe94b5251934a1d855974d846f3de6bdb314c7e9
2015-08-10 17:03:38 -07:00
Dianne Hackborn
fa8a85da05
am 996e285c
: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit '996e285cdcd26ee7251ec80915eeed57541efb6d':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-10 22:02:23 +00:00
Dianne Hackborn
996e285cdc
Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
2015-08-10 21:55:23 +00:00
Julia Reynolds
77dc56bc4c
am 2557d8a2
: Merge "Wrap text on long preferences." into mnc-dev
...
* commit '2557d8a25124b93801bc5de1b1b2d063cad1c3ff':
Wrap text on long preferences.
2015-08-10 20:37:34 +00:00
Julia Reynolds
2557d8a251
Merge "Wrap text on long preferences." into mnc-dev
2015-08-10 20:32:49 +00:00