OSDN Git Service
Julia Reynolds [Mon, 17 Aug 2015 17:57:03 +0000 (17:57 +0000)]
am
c1682e0a: am
904a7e96: am
db4a029f: am
62fdd558: am
0ece6a32: String update for battery details page.
* commit '
c1682e0a7270f7805267f7cfaa66a2d22a8d83df':
String update for battery details page.
Julia Reynolds [Mon, 17 Aug 2015 17:47:29 +0000 (17:47 +0000)]
am
904a7e96: am
db4a029f: am
62fdd558: am
0ece6a32: String update for battery details page.
* commit '
904a7e96a9c8023cd4a24c73a5f77659b48f04d8':
String update for battery details page.
Julia Reynolds [Mon, 17 Aug 2015 17:39:38 +0000 (17:39 +0000)]
am
db4a029f: am
62fdd558: am
0ece6a32: String update for battery details page.
* commit '
db4a029f66092ee8497775e434c21fee7dbda486':
String update for battery details page.
Julia Reynolds [Mon, 17 Aug 2015 17:32:26 +0000 (17:32 +0000)]
am
62fdd558: am
0ece6a32: String update for battery details page.
* commit '
62fdd5581e131731651e4afb96bedd8092ffd9cc':
String update for battery details page.
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.
Chris Wren [Mon, 17 Aug 2015 17:16:08 +0000 (17:16 +0000)]
am
e932cf23: am
a18e6ffe: am
8b98ef6f: am
15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev
* commit '
e932cf23a8e587c32b100e72bc8c9a1c4bb835b7':
instrument fingerprint settings
Julia Reynolds [Mon, 17 Aug 2015 17:15:34 +0000 (17:15 +0000)]
Merge "Add null check when loading restricted profile apps."
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 17:09:47 +0000 (17:09 +0000)]
am
a18e6ffe: am
8b98ef6f: am
15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev
* commit '
a18e6ffe9a3c53daa57d622965f594b56dd559a5':
instrument fingerprint settings
Julia Reynolds [Mon, 17 Aug 2015 17:09:47 +0000 (13:09 -0400)]
Add null check when loading restricted profile apps.
In case the profile is being deleted.
Bug:
22235449
Change-Id: Ia67deb4e578edf79079ddc308b0750327c1ff85d
Chris Wren [Mon, 17 Aug 2015 17:01:58 +0000 (17:01 +0000)]
am
8b98ef6f: am
15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev
* commit '
8b98ef6fd80c300e327b9f189ac800492f8cb9f5':
instrument fingerprint settings
Chris Wren [Mon, 17 Aug 2015 16:52:25 +0000 (16:52 +0000)]
am
15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev
* commit '
15ff8af7a7cec3c55dde81419b0522fc4adcbeb1':
instrument fingerprint settings
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 16:26:46 +0000 (16:26 +0000)]
am
12a4d031: am
51ba8b47: am
99df2376: am
9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
* commit '
12a4d0313f8e964b727484448bd9b4ed8af1dc5f':
Fix Usb-C dialog issues
Geoff Mendal [Mon, 17 Aug 2015 16:26:28 +0000 (16:26 +0000)]
am
4c36f443: (-s ours) am
f1ad264c: (-s ours) am
7533cd47: (-s ours) am
3c274207: (-s ours) Import translations. DO NOT MERGE
* commit '
4c36f443a368a0409203612a331cbc928d2485dd':
Import translations. DO NOT MERGE
Jason Monk [Mon, 17 Aug 2015 15:49:39 +0000 (15:49 +0000)]
am
51ba8b47: am
99df2376: am
9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
* commit '
51ba8b47f501d5fe5915a997507aba2fc246012e':
Fix Usb-C dialog issues
Jason Monk [Mon, 17 Aug 2015 15:41:16 +0000 (15:41 +0000)]
am
99df2376: am
9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
* commit '
99df2376a161d1a1328b64dfd2451aeb2c50e532':
Fix Usb-C dialog issues
Jason Monk [Mon, 17 Aug 2015 15:35:45 +0000 (15:35 +0000)]
am
9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
* commit '
9d59a2441ee59b0fe74f49cb12de3af2cab89da1':
Fix Usb-C dialog issues
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:27:25 +0000 (14:27 +0000)]
am
f1ad264c: (-s ours) am
7533cd47: (-s ours) am
3c274207: (-s ours) Import translations. DO NOT MERGE
* commit '
f1ad264cf8ee8e0ca2f79c13618f4218bab560b1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Aug 2015 14:19:03 +0000 (14:19 +0000)]
am
7533cd47: (-s ours) am
3c274207: (-s ours) Import translations. DO NOT MERGE
* commit '
7533cd473df2acf79c874f40123865d554434b90':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Aug 2015 14:12:28 +0000 (14:12 +0000)]
am
3c274207: (-s ours) Import translations. DO NOT MERGE
* commit '
3c27420773e35c753e9d4f0114886a68da953469':
Import translations. DO NOT MERGE
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
Geoff Mendal [Mon, 17 Aug 2015 13:16:08 +0000 (06:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I43b55b016758b18892141f67662f8b435212e8ca
Auto-generated-cl: translation import
Adam Lesinski [Fri, 14 Aug 2015 21:22:48 +0000 (14:22 -0700)]
Merge commit '
f34d3111' into manualmerge
Change-Id: I4bc1b449c4b48b6f295035457b66b95e180c6ddd
Jeff Sharkey [Fri, 14 Aug 2015 21:12:58 +0000 (21:12 +0000)]
am
a334d530: am
b38493cc: am
b0f9e9d4: am
82fee7bd: am
b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
* commit '
a334d53025fbbf187f5aad5abf61091f9c994e01':
Only offer migration between private volumes.
Julia Reynolds [Fri, 14 Aug 2015 20:23:23 +0000 (20:23 +0000)]
Merge "Allow admins to remove users."
Julia Reynolds [Fri, 14 Aug 2015 20:20:39 +0000 (20:20 +0000)]
Merge "Fix crash creating notification lockscreen setting."
Julia Reynolds [Fri, 14 Aug 2015 20:13:10 +0000 (16:13 -0400)]
Allow admins to remove users.
(Instead of only letting non-admins do that)
Bug:
23220408
Change-Id: Ia27906eba9217fae104f24d227920782e1a27c5f
Christopher Tate [Fri, 14 Aug 2015 20:08:32 +0000 (13:08 -0700)]
resolved conflicts for merge of
b1840567 to master
Change-Id: Ieb83bd61e624609ce3c339ed0c33c691cb4b38bb
Adam Lesinski [Fri, 14 Aug 2015 20:01:51 +0000 (20:01 +0000)]
am
b5ca40c6: am
11d1caed: am
e3ddd117: am
3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
* commit '
b5ca40c6442c4f30b79dcd202bb9fecc65ba436c':
BatteryStats: Fix coalescing of shared app GIDs and system UIDs
Julia Reynolds [Fri, 14 Aug 2015 16:59:52 +0000 (12:59 -0400)]
Fix crash creating notification lockscreen setting.
Bug:
23210434
Change-Id: Ic214b34cb540e226c9e871fcda8432460cf3a46f
Adam Lesinski [Fri, 14 Aug 2015 19:55:05 +0000 (19:55 +0000)]
am
11d1caed: am
e3ddd117: am
3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
* commit '
11d1caede255fe9643692974031fb93448adbd97':
BatteryStats: Fix coalescing of shared app GIDs and system UIDs
Adam Lesinski [Fri, 14 Aug 2015 19:47:43 +0000 (19:47 +0000)]
am
e3ddd117: am
3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
* commit '
e3ddd117a6bd6f25ea345349fe59be6a4ada3161':
BatteryStats: Fix coalescing of shared app GIDs and system UIDs
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:47:12 +0000 (18:47 +0000)]
am
b38493cc: am
b0f9e9d4: am
82fee7bd: am
b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
* commit '
b38493cc6c52346edbcb045a67b1f4831a80290e':
Only offer migration between private volumes.
Jeff Sharkey [Fri, 14 Aug 2015 18:40:03 +0000 (18:40 +0000)]
am
b0f9e9d4: am
82fee7bd: am
b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
* commit '
b0f9e9d49fb9cf0c4ffada36dc129b7899f16ffb':
Only offer migration between private volumes.
Jeff Sharkey [Fri, 14 Aug 2015 18:34:36 +0000 (18:34 +0000)]
am
82fee7bd: am
b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
* commit '
82fee7bd0a82a48e204bcaf5480701b36c857276':
Only offer migration between private volumes.
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:41:11 +0000 (17:41 +0000)]
am
95a3e220: am
7c8cb46f: am
36e2d32d: am
7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '
95a3e2200c8e2662999bf2453ca8312d6c5312c0':
Make "Ask every time" actually work that way
Chris Tate [Fri, 14 Aug 2015 17:35:13 +0000 (17:35 +0000)]
am
7c8cb46f: am
36e2d32d: am
7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '
7c8cb46fe383956830a04e079a13ded56f7c2154':
Make "Ask every time" actually work that way
Chris Tate [Fri, 14 Aug 2015 17:27:02 +0000 (17:27 +0000)]
am
36e2d32d: am
7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '
36e2d32dab47f9d46c0234202c2a799c43b67c9e':
Make "Ask every time" actually work that way
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
Julia Reynolds [Fri, 14 Aug 2015 12:46:08 +0000 (08:46 -0400)]
Use a button style that visibly shows when the button is disabled.
Bug:
21199007
Change-Id: I5bcfa4cfcc7b39eaadae8b8af4c13591f497fee8
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 03:27:38 +0000 (03:27 +0000)]
am
6dcc2004: am
ffe642ed: am
fa620435: am
c73287b9: am
ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
* commit '
6dcc2004ad49c7b2cbdb5fc87a9b83d1be1cccaf':
Show storage slow dialog allowing state loss.
Jeff Sharkey [Fri, 14 Aug 2015 03:18:55 +0000 (03:18 +0000)]
am
ffe642ed: am
fa620435: am
c73287b9: am
ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
* commit '
ffe642ed030277d2e065b6ad55596c35b1daff39':
Show storage slow dialog allowing state loss.
Jeff Sharkey [Fri, 14 Aug 2015 01:37:59 +0000 (01:37 +0000)]
am
fa620435: am
c73287b9: am
ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
* commit '
fa62043590d5ae99008aa1ddbd1e8b1f052fc0a1':
Show storage slow dialog allowing state loss.
Jeff Sharkey [Fri, 14 Aug 2015 01:31:27 +0000 (01:31 +0000)]
am
c73287b9: am
ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
* commit '
c73287b9dbfe63ddde24ac1e0975f50382f24e71':
Show storage slow dialog allowing state loss.
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
Todd Kennedy [Thu, 13 Aug 2015 19:57:37 +0000 (19:57 +0000)]
Merge "Fix string for translation"
Todd Kennedy [Thu, 13 Aug 2015 19:56:48 +0000 (12:56 -0700)]
Fix string for translation
Increase character limit and help provide some additional context for
the strings
Bug:
23175115
Bug:
23173307
Bug:
23172615
Change-Id: I27c67f39323f359744ae3791ea538030820dc0d0
Julia Reynolds [Thu, 13 Aug 2015 14:42:39 +0000 (14:42 +0000)]
Merge "Switch font size from a dialog to dropdown preference."
Julia Reynolds [Wed, 12 Aug 2015 18:51:34 +0000 (14:51 -0400)]
Switch font size from a dialog to dropdown preference.
Bug:
16634975
Change-Id: I8edaf63afe3f43e0bb152428c6ca0c6b1ccd0eb4
Geoff Mendal [Thu, 13 Aug 2015 06:55:08 +0000 (06:55 +0000)]
am
06d14c52: (-s ours) am
b3852044: (-s ours) am
93d1612d: (-s ours) am
8a12d17b: (-s ours) am
eea96f22: (-s ours) Import translations. DO NOT MERGE
* commit '
06d14c5243af84dfb2ba1a9027c9215b6d751d1e':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 13 Aug 2015 06:43:03 +0000 (06:43 +0000)]
am
b3852044: (-s ours) am
93d1612d: (-s ours) am
8a12d17b: (-s ours) am
eea96f22: (-s ours) Import translations. DO NOT MERGE
* commit '
b38520448f52683130a01728eab67018929775b2':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 13 Aug 2015 05:09:45 +0000 (05:09 +0000)]
am
93d1612d: (-s ours) am
8a12d17b: (-s ours) am
eea96f22: (-s ours) Import translations. DO NOT MERGE
* commit '
93d1612d160f3e71c6dead490a36a334f6abb25f':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 13 Aug 2015 05:04:41 +0000 (05:04 +0000)]
am
8a12d17b: (-s ours) am
eea96f22: (-s ours) Import translations. DO NOT MERGE
* commit '
8a12d17b09281f09adaf6685680f7cb991aef049':
Import translations. DO NOT MERGE
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 03:18:43 +0000 (03:18 +0000)]
am
90ca1b67: am
0cae8ad7: am
e9639b1d: am
5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
* commit '
90ca1b67cfa1507126c6b74b2de059d3bf579734':
Wait with finishing until fingerprints are removed
Dianne Hackborn [Thu, 13 Aug 2015 02:10:09 +0000 (02:10 +0000)]
am
a0b5ab0e: am
cd2b9e12: am
2be290cf: am
6a1e1e08: am
f67d0785: Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
* commit '
a0b5ab0ef6b9525e4bb68bb0ac6c8f3bfb144c9f':
Fix issue #
23116383: Include security patch level in Settings
Jorim Jaggi [Thu, 13 Aug 2015 01:42:13 +0000 (01:42 +0000)]
am
0cae8ad7: am
e9639b1d: am
5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
* commit '
0cae8ad78170d56beaafcb18015e25421895ac50':
Wait with finishing until fingerprints are removed
Jorim Jaggi [Thu, 13 Aug 2015 01:35:51 +0000 (01:35 +0000)]
am
e9639b1d: am
5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
* commit '
e9639b1d0141ce25548105a17eab3e30b6341f1a':
Wait with finishing until fingerprints are removed
Jorim Jaggi [Thu, 13 Aug 2015 01:28:21 +0000 (01:28 +0000)]
am
5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
* commit '
5dd0e27fbbc8207ca9c8e05e60cf8f9ea5c0c88a':
Wait with finishing until fingerprints are removed
Dianne Hackborn [Thu, 13 Aug 2015 01:18:08 +0000 (01:18 +0000)]
am
cd2b9e12: am
2be290cf: am
6a1e1e08: am
f67d0785: Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
* commit '
cd2b9e1217ef622dcd5127715c9ee5b3db6504ee':
Fix issue #
23116383: Include security patch level in Settings
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 01:09:10 +0000 (01:09 +0000)]
am
2be290cf: am
6a1e1e08: am
f67d0785: Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
* commit '
2be290cf36f06da260e67b430a625422da512609':
Fix issue #
23116383: Include security patch level in Settings
Dianne Hackborn [Thu, 13 Aug 2015 01:02:23 +0000 (01:02 +0000)]
am
6a1e1e08: am
f67d0785: Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
* commit '
6a1e1e08a0b5f671a1054b9a46f1e0c0a90738c4':
Fix issue #
23116383: Include security patch level in Settings
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:23:13 +0000 (18:23 +0000)]
Merge "Make DropDownPreference extend ListPreference"
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 18:09:32 +0000 (18:09 +0000)]
am
f974b78d: am
8d425a52: am
d0513282: am
1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev
* commit '
f974b78d36f7bd449d3dbfc7c7c64e273cb16c78':
Avoid sending identity along with EAP sim, aka & aka'.
Sanket Padawe [Wed, 12 Aug 2015 18:03:56 +0000 (18:03 +0000)]
am
8d425a52: am
d0513282: am
1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev
* commit '
8d425a526b383c1e0c2d60fd3c27f7a5dd5e5e2f':
Avoid sending identity along with EAP sim, aka & aka'.
Sanket Padawe [Wed, 12 Aug 2015 17:50:54 +0000 (17:50 +0000)]
am
d0513282: am
1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev
* commit '
d0513282f81d8218eb0fef93a7316a6699d087f7':
Avoid sending identity along with EAP sim, aka & aka'.
Sanket Padawe [Wed, 12 Aug 2015 17:34:42 +0000 (17:34 +0000)]
am
1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev
* commit '
1d29bde1f5369b5cb5b24adbad662ef33524f4e2':
Avoid sending identity along with EAP sim, aka & aka'.
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
Jason Monk [Wed, 12 Aug 2015 15:31:29 +0000 (11:31 -0400)]
Make DropDownPreference extend ListPreference
Lots of updates to handle static setting of entries/values
Callbacks are now through preference changes
Fix weird inconsistencies in callback return values...
Change-Id: I2ebe02c3492ce543162efcd55bdae3f2c4039287
Todd Kennedy [Wed, 12 Aug 2015 16:53:32 +0000 (16:53 +0000)]
Merge "Add force external setting"
Geoff Mendal [Wed, 12 Aug 2015 14:24:56 +0000 (14:24 +0000)]
am
0c49d5b9: (-s ours) am
ce821387: (-s ours) am
699ef29e: (-s ours) am
42ae7fba: (-s ours) Import translations. DO NOT MERGE
* commit '
0c49d5b9d08ad352af78d1e943623585f49a7f3f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 12 Aug 2015 14:18:59 +0000 (14:18 +0000)]
am
ce821387: (-s ours) am
699ef29e: (-s ours) am
42ae7fba: (-s ours) Import translations. DO NOT MERGE
* commit '
ce821387ba6b6745a99c2a3231a5c0b2e42a34fc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 12 Aug 2015 14:11:11 +0000 (14:11 +0000)]
am
699ef29e: (-s ours) am
42ae7fba: (-s ours) Import translations. DO NOT MERGE
* commit '
699ef29e9fcf59eb1023c767cceab4de4f64ae13':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 12 Aug 2015 14:06:27 +0000 (14:06 +0000)]
am
42ae7fba: (-s ours) Import translations. DO NOT MERGE
* commit '
42ae7fba5b6570cfa36d2132ce30bb23bd91d2e9':
Import translations. DO NOT MERGE
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
Geoff Mendal [Wed, 12 Aug 2015 13:11:54 +0000 (06:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9361c89e61ac3f958dc840806aae88fece5d4aab
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 [Wed, 12 Aug 2015 00:00:22 +0000 (00:00 +0000)]
am
9ee3a615: am
f1808dca: am
e5d64684: am
a7bdde58: am
9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
* commit '
9ee3a615463faec08d4dfb9b045f9211c93d742e':
[ConfirmPattern] use correct user id for stealth mode
Dianne Hackborn [Wed, 12 Aug 2015 00:00:20 +0000 (00:00 +0000)]
am
5876e309: am
0f440a70: am
540afe77: am
e2e76435: am
8500822b: Merge "Fix issue #
23079119: Description for write settings permission says..." into mnc-dev
* commit '
5876e30931915f3dcfcf044e7ce46ca039ace75a':
Fix issue #
23079119: Description for write settings permission says...
Andres Morales [Tue, 11 Aug 2015 23:56:36 +0000 (23:56 +0000)]
am
f1808dca: am
e5d64684: am
a7bdde58: am
9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
* commit '
f1808dcafc45fea92e27b5300f4d6cc742bb3105':
[ConfirmPattern] use correct user id for stealth mode
OSDN Git Service
