Commit Graph

21770 Commits

Author SHA1 Message Date
Baligh Uddin
bb7eeadecc Import translations. DO NOT MERGE
Change-Id: I023e0203ab81ea1738c1730501a84a7719e13329
Auto-generated-cl: translation import
2015-09-29 03:27:41 -07:00
Sanket Padawe
620374492f am 3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
* commit '3be6d0b44bf1152be0bc11bf6bacf750e1028b49':
  Avoid new network to connect by using "Add Network" instead only Save it.
2015-08-24 17:59:41 +00:00
Sanket Padawe
3be6d0b44b Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev 2015-08-24 17:52:51 +00:00
Sanket Padawe
e0ece963c6 Avoid new network to connect by using "Add Network" instead only Save it.
Bug: 23422433
Change-Id: I49aabff91ba127bf2a3b0aa25c8163ee4097bf4d
2015-08-21 16:45:30 -07:00
Christopher Tate
356e5b585c 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:32 +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
c877856a05 am 19551115: Adapted string length translation limits
* commit '19551115dbb3d848be084462342d41addeb1caf6':
  Adapted string length translation limits
2015-08-20 19:06:47 +00:00
Selim Cinek
19551115db Adapted string length translation limits
Bug: 23298302
Change-Id: Id7651b28bab6e4ff37e94b30d68509ae959c6d70
2015-08-20 18:57:22 +00:00
Julia Reynolds
42f2b35435 am 0ece6a32: String update for battery details page.
* commit '0ece6a3241062842db991ad63add899369ce1853':
  String update for battery details page.
2015-08-17 17:24:56 +00:00
Julia Reynolds
0ece6a3241 String update for battery details page.
Bug: 22978210
Change-Id: I87d231868d6116c3f0d88a6a6d3ca5fac1ce8c90
2015-08-17 13:14:38 -04:00
Adam Lesinski
f71fbbffb5 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:45:45 +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
08fe57cbbb am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
* commit 'b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61':
  Only offer migration between private volumes.
2015-08-14 18:31:46 +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
71efd816e6 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:19:37 +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
38c819072c 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:29 +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
36fe2c6a13 am eea96f22: (-s ours) Import translations. DO NOT MERGE
* commit 'eea96f22a1ec156d78374f49352341c46c219ca0':
  Import translations. DO NOT MERGE
2015-08-13 06:58:22 +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
Dianne Hackborn
df85a4fc21 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:57:45 +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
Andres Morales
af48dffe4f 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:46 +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
7f45b55dd8 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:52 +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
ef90693895 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:15 +00:00
Maurice Lam
3d9cb92618 Merge "[Fingerprint] Use different ring size for setup" into mnc-dev 2015-08-11 22:35:53 +00: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
Dianne Hackborn
ef54ab616a 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:17:11 +00:00
Dianne Hackborn
f664947291 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:12:59 +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
6aeabbf2d2 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:03:37 +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
0a27e57dd9 am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev
* commit '2557d8a25124b93801bc5de1b1b2d063cad1c3ff':
  Wrap text on long preferences.
2015-08-10 20:38:15 +00:00
Julia Reynolds
2557d8a251 Merge "Wrap text on long preferences." into mnc-dev 2015-08-10 20:32:49 +00:00
Jason Monk
656145a0e0 am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
* commit 'cf1e22f4471f39f4cf3c134006ecf9ffedb91e36':
  Remove extra help & feedback menu from power usage
2015-08-10 20:23:14 +00:00
Jason Monk
cf1e22f447 Merge "Remove extra help & feedback menu from power usage" into mnc-dev 2015-08-10 20:09:20 +00:00
Jason Monk
3006c377c2 Remove extra help & feedback menu from power usage
Bug: 23044354
Change-Id: Ic722655a50eddbf4f8e53a2b73ed49b5cf6426a4
2015-08-10 15:58:09 -04:00
Pavel Zhamaitsiak
667be5d6bf 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
2015-08-10 17:35:09 +00:00
Pavel Zhamaitsiak
8cf5426499 Merge "Ensure that listener is removed only if it was added" into mnc-dev 2015-08-10 17:29:38 +00:00
Jeff Sharkey
e56724ba46 am 67f0739c: Merge "Block moving when already in progress." into mnc-dev
* commit '67f0739ca3a81515975856b09d216debfd090ae9':
  Block moving when already in progress.
2015-08-07 23:46:42 +00:00