Commit Graph

21865 Commits

Author SHA1 Message Date
Christopher Tate
5d187aa43d am ffe701dc: Present the security patch date in a human-friendly format
* commit 'ffe701dc0e52ee95bf6c54291ed1b574d389019c':
  Present the security patch date in a human-friendly format
2015-08-21 19:26:07 +00:00
Christopher Tate
ffe701dc0e Present the security patch date in a human-friendly format
For example, for an ISO date of 2015-08-01, this now displays
"August 1, 2015" in enUS, and "1 August 2015" in enUK, and
"2015年8月1日" in jpJP.

Bug 23358065

Change-Id: Iaa920ec88d765a222f0b589123665b689bf41978
2015-08-20 17:16:08 -07:00
Selim Cinek
6ee587a01d am a5e3aca4: am dba47d0c: am 19551115: Adapted string length translation limits
* commit 'a5e3aca4f8d49d1b4b092d8353e117ed77ac2e8a':
  Adapted string length translation limits
2015-08-20 19:19:32 +00:00
Selim Cinek
a5e3aca4f8 am dba47d0c: am 19551115: Adapted string length translation limits
* commit 'dba47d0c7fe5c3b21d4b274cfdd9a84232644395':
  Adapted string length translation limits
2015-08-20 19:11:58 +00:00
Selim Cinek
dba47d0c7f am 19551115: Adapted string length translation limits
* commit '19551115dbb3d848be084462342d41addeb1caf6':
  Adapted string length translation limits
2015-08-20 19:04:30 +00:00
Selim Cinek
19551115db Adapted string length translation limits
Bug: 23298302
Change-Id: Id7651b28bab6e4ff37e94b30d68509ae959c6d70
2015-08-20 18:57:22 +00:00
Maurice Lam
537b5d6eae am 4d06defe: am d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
* commit '4d06defe88b46ec877e0bb6e1ac095bd650ab9df':
  [Fingerprint] Smaller enrolling ring
2015-08-20 00:08:43 +00:00
Maurice Lam
4d06defe88 am d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
* commit 'd809de884761f290a94f01f21b5c94e262ec22ea':
  [Fingerprint] Smaller enrolling ring
2015-08-19 23:59:13 +00:00
Maurice Lam
d809de8847 Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev 2015-08-19 23:51:30 +00:00
Geoff Mendal
1042f538a2 am 9c989954: (-s ours) am a206a162: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '9c98995468e530f8c0d925ce3b5285756930224e':
  Import translations. DO NOT MERGE
2015-08-19 14:20:55 +00:00
Geoff Mendal
9c98995468 am a206a162: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'a206a162d1a55e7c440c125b504bef83eb361c84':
  Import translations. DO NOT MERGE
2015-08-19 14:15:27 +00:00
Paul Lawrence
22ab07ea8f am f7f0a85f: am 1f8fb0f8: Stop crash on repeated enters on virtual keyboard
* commit 'f7f0a85fe6c7d68a127f42e3528ef81050f8dd0c':
  Stop crash on repeated enters on virtual keyboard
2015-08-19 14:15:07 +00:00
Geoff Mendal
a206a162d1 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-19 14:09:16 +00:00
Paul Lawrence
f7f0a85fe6 am 1f8fb0f8: Stop crash on repeated enters on virtual keyboard
* commit '1f8fb0f8ce1e82266a3a12b3d31b9062cff3fc44':
  Stop crash on repeated enters on virtual keyboard
2015-08-19 14:08:36 +00:00
Geoff Mendal
d401a062c7 Import translations. DO NOT MERGE
Change-Id: I9ab62b9e28b5dd6f8cd2a54e1ae7e015b8730e03
Auto-generated-cl: translation import
2015-08-19 07:08:00 -07:00
Maurice Lam
27fa865db7 [Fingerprint] Smaller enrolling ring
Make the enrolling progress ring smaller in sw400dp during setup.

Bug: 23216520
Change-Id: I01a862baf9ea3e75e2164d12b7ef13dee5f28c5a
2015-08-18 18:30:36 -07:00
Paul Lawrence
1f8fb0f8ce Stop crash on repeated enters on virtual keyboard
Change https://googleplex-android-review.git.corp.google.com/#/c/742462/
removed the mDone since graying out the button seemed to remove the need
for this. However, you can also enter this command repeatedly from the
soft keyboard.

Put mDone back.

Bug: 23181625
Change-Id: I42e8ecb9824b17825778c9c113130506cc3a200b
2015-08-18 16:25:00 +00:00
Julia Reynolds
904a7e96a9 am db4a029f: am 62fdd558: am 0ece6a32: String update for battery details page.
* commit 'db4a029f66092ee8497775e434c21fee7dbda486':
  String update for battery details page.
2015-08-17 17:39:38 +00:00
Julia Reynolds
db4a029f66 am 62fdd558: am 0ece6a32: String update for battery details page.
* commit '62fdd5581e131731651e4afb96bedd8092ffd9cc':
  String update for battery details page.
2015-08-17 17:32:26 +00: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
a18e6ffe9a am 8b98ef6f: am 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev
* commit '8b98ef6fd80c300e327b9f189ac800492f8cb9f5':
  instrument fingerprint settings
2015-08-17 17:01:58 +00:00
Chris Wren
8b98ef6fd8 am 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev
* commit '15ff8af7a7cec3c55dde81419b0522fc4adcbeb1':
  instrument fingerprint settings
2015-08-17 16:52:25 +00:00
Chris Wren
15ff8af7a7 Merge "instrument fingerprint settings" into mnc-dr-dev 2015-08-17 16:47:56 +00:00
Jason Monk
51ba8b47f5 am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
* commit '99df2376a161d1a1328b64dfd2451aeb2c50e532':
  Fix Usb-C dialog issues
2015-08-17 15:41:16 +00:00
Jason Monk
99df2376a1 am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
* commit '9d59a2441ee59b0fe74f49cb12de3af2cab89da1':
  Fix Usb-C dialog issues
2015-08-17 15:35:45 +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
f1ad264cf8 am 7533cd47: (-s ours) am 3c274207: (-s ours) Import translations. DO NOT MERGE
* commit '7533cd473df2acf79c874f40123865d554434b90':
  Import translations. DO NOT MERGE
2015-08-17 14:19:03 +00:00
Geoff Mendal
7533cd473d am 3c274207: (-s ours) Import translations. DO NOT MERGE
* commit '3c27420773e35c753e9d4f0114886a68da953469':
  Import translations. DO NOT MERGE
2015-08-17 14:12:28 +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
Adam Lesinski
b5ca40c644 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
2015-08-14 19:55:05 +00:00
Adam Lesinski
11d1caede2 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
2015-08-14 19:47:43 +00: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
b38493cc6c am b0f9e9d4: am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
* commit 'b0f9e9d49fb9cf0c4ffada36dc129b7899f16ffb':
  Only offer migration between private volumes.
2015-08-14 18:40:03 +00:00
Jeff Sharkey
b0f9e9d49f am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
* commit '82fee7bd0a82a48e204bcaf5480701b36c857276':
  Only offer migration between private volumes.
2015-08-14 18:34:36 +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
95a3e2200c 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
2015-08-14 17:35:13 +00:00
Chris Tate
7c8cb46fe3 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
2015-08-14 17:27:02 +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
ffe642ed03 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.
2015-08-14 01:37:59 +00:00
Jeff Sharkey
fa62043590 am c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
* commit 'c73287b9dbfe63ddde24ac1e0975f50382f24e71':
  Show storage slow dialog allowing state loss.
2015-08-14 01:31:27 +00: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