OSDN Git Service
Jeff Sharkey [Thu, 27 Aug 2015 11:30:29 +0000 (11:30 +0000)]
am
31d519fe: (-s ours) am
66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit '
31d519fe37f6132f01b6193fec91d9f9b5b97908':
Jeff Sharkey [Thu, 27 Aug 2015 11:30:22 +0000 (11:30 +0000)]
am
139e1964: (-s ours) am
7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit '
139e19647169a736d1f8b1b71479bd36742a2341':
Geoff Mendal [Thu, 27 Aug 2015 11:30:06 +0000 (11:30 +0000)]
am
479b00cd: (-s ours) am
e21573da: (-s ours) Import translations. DO NOT MERGE
* commit '
479b00cd40c0173ba3e51f072efa0aa5e432234c':
Geoff Mendal [Wed, 26 Aug 2015 14:33:36 +0000 (14:33 +0000)]
am
ebf23a76: (-s ours) am
3b545b41: (-s ours) am
fbfdede1: (-s ours) Import translations. DO NOT MERGE
* commit '
ebf23a763f240b203480d53bc29895d14e230f89':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Aug 2015 14:25:58 +0000 (14:25 +0000)]
am
3b545b41: (-s ours) am
fbfdede1: (-s ours) Import translations. DO NOT MERGE
* commit '
3b545b41b931919fab3528e2bbb81ded620378b2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Aug 2015 14:19:37 +0000 (14:19 +0000)]
am
fbfdede1: (-s ours) Import translations. DO NOT MERGE
* commit '
fbfdede15b6a81655a5b4fc274340ba58c3d4a99':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Aug 2015 14:12:08 +0000 (07:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1d08cdfb6ad7723d4e0bd578b0b699fc9d2389db
Auto-generated-cl: translation import
Jim Miller [Tue, 25 Aug 2015 23:33:55 +0000 (23:33 +0000)]
am
d63408d9: am
d7e4cd9b: am
f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev
* commit '
d63408d91576277acec9c2169e48eff839516470':
Don't attempt to remove fp templates if none are enrolled
Jim Miller [Tue, 25 Aug 2015 23:25:08 +0000 (23:25 +0000)]
am
d7e4cd9b: am
f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev
* commit '
d7e4cd9b1edb25651d3fa306e389b7ec858c1ed8':
Don't attempt to remove fp templates if none are enrolled
Jim Miller [Tue, 25 Aug 2015 23:18:54 +0000 (23:18 +0000)]
am
f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev
* commit '
f7fc6429874fd02bc3670bce98b2158d2a78aecd':
Don't attempt to remove fp templates if none are enrolled
Jim Miller [Tue, 25 Aug 2015 23:08:55 +0000 (23:08 +0000)]
Merge "Don't attempt to remove fp templates if none are enrolled" into mnc-dr-dev
Wei Liu [Tue, 25 Aug 2015 18:37:40 +0000 (18:37 +0000)]
am
70238114: am
6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.
* commit '
702381144781d68551e765dcf8b23cf3dbca3ce5':
Refactor UidDetailProvider and its dependencies to SettingsLib.
Wei Liu [Tue, 25 Aug 2015 18:32:41 +0000 (18:32 +0000)]
am
6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.
* commit '
6e58d516f05bbceabdddd3aa08a94fcc32858e71':
Refactor UidDetailProvider and its dependencies to SettingsLib.
Wei Liu [Tue, 25 Aug 2015 18:11:06 +0000 (18:11 +0000)]
am
ad50b81f: am
0e309b86: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
* commit '
ad50b81f492fb01390679f697d1f340da35ef28c':
Move SummaryForAllUidLoader to SettingsLib.
Wei Liu [Tue, 25 Aug 2015 18:03:37 +0000 (18:03 +0000)]
am
0e309b86: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
* commit '
0e309b867d1872b8cd0d6d435e10d6d3be48a3bd':
Move SummaryForAllUidLoader to SettingsLib.
Wei Liu [Tue, 25 Aug 2015 00:29:04 +0000 (17:29 -0700)]
Refactor UidDetailProvider and its dependencies to SettingsLib.
so that it can be reused by Wear app data usage.
Change-Id: Id05f888274e15fbeffa175ee8073de02a8966867
Wei Liu [Tue, 25 Aug 2015 17:55:31 +0000 (17:55 +0000)]
Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
Wei Liu [Fri, 21 Aug 2015 05:33:46 +0000 (22:33 -0700)]
Move SummaryForAllUidLoader to SettingsLib.
In order to show the data usage per app on Android Wear,
I'm moving SummaryForAllUidLoader to SettingsLib so that
the code can be reused.
Change-Id: I1833492d4a3b513405bfc1069b8656d04dd37c48
Sanket Padawe [Mon, 24 Aug 2015 18:21:51 +0000 (18:21 +0000)]
am
226dec50: am
8b58dc57: am
1a9626f0: am
3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
* commit '
226dec509dd03638dbb489a75f35ec49d2fe4dca':
Avoid new network to connect by using "Add Network" instead only Save it.
Sanket Padawe [Mon, 24 Aug 2015 18:12:57 +0000 (18:12 +0000)]
am
8b58dc57: am
1a9626f0: am
3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
* commit '
8b58dc577cc86af08f350c46f7059566fdc54961':
Avoid new network to connect by using "Add Network" instead only Save it.
Sanket Padawe [Mon, 24 Aug 2015 18:05:59 +0000 (18:05 +0000)]
am
1a9626f0: am
3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
* commit '
1a9626f056d253aa25fca561010624c463bbf9a9':
Avoid new network to connect by using "Add Network" instead only Save it.
Sanket Padawe [Mon, 24 Aug 2015 17:59:07 +0000 (17:59 +0000)]
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.
Sanket Padawe [Mon, 24 Aug 2015 17:52:51 +0000 (17:52 +0000)]
Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
Geoff Mendal [Mon, 24 Aug 2015 16:54:53 +0000 (16:54 +0000)]
am
8466a365: (-s ours) am
d8fd1cd7: (-s ours) am
9a86c085: (-s ours) Import translations. DO NOT MERGE
* commit '
8466a365b3dca0f3a8a9392c8d57843b417963c0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Aug 2015 14:41:35 +0000 (14:41 +0000)]
am
d8fd1cd7: (-s ours) am
9a86c085: (-s ours) Import translations. DO NOT MERGE
* commit '
d8fd1cd7d93ff4a86ae0277b2fb27c864eca252d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Aug 2015 14:29:57 +0000 (14:29 +0000)]
am
9a86c085: (-s ours) Import translations. DO NOT MERGE
* commit '
9a86c08593d8fd3e5bb4a20f1705c3a803e67a5e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Aug 2015 14:16:24 +0000 (07:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I14e14a1e5f548b559939584de4a209990318f799
Auto-generated-cl: translation import
Jim Miller [Sat, 22 Aug 2015 01:07:50 +0000 (18:07 -0700)]
Don't attempt to remove fp templates if none are enrolled
The code was blindly calling fpm.remove(0) to remove all
fingerprint templates and then waiting for them to be removed.
Fixes bug
23183484
Change-Id: Ie510097d85bba32d965ba3c7f324f6c042e08300
Christopher Tate [Sat, 22 Aug 2015 00:41:22 +0000 (00:41 +0000)]
am
b20e1b6c: am
c9d5bfcb: am
5d187aa4: am
ffe701dc: Present the security patch date in a human-friendly format
* commit '
b20e1b6cca89eff91bc63b8918e8f75d450a5854':
Present the security patch date in a human-friendly format
Christopher Tate [Sat, 22 Aug 2015 00:27:20 +0000 (00:27 +0000)]
am
c9d5bfcb: am
5d187aa4: am
ffe701dc: Present the security patch date in a human-friendly format
* commit '
c9d5bfcb96ae8b1ed6128c03b4f9efd10d6f3b40':
Present the security patch date in a human-friendly format
Christopher Tate [Sat, 22 Aug 2015 00:16:24 +0000 (00:16 +0000)]
am
5d187aa4: am
ffe701dc: Present the security patch date in a human-friendly format
* commit '
5d187aa43d262582241cd3a7097fc2fda0c875e6':
Present the security patch date in a human-friendly format
Sanket Padawe [Fri, 21 Aug 2015 23:45:30 +0000 (16:45 -0700)]
Avoid new network to connect by using "Add Network" instead only Save it.
Bug:
23422433
Change-Id: I49aabff91ba127bf2a3b0aa25c8163ee4097bf4d
Christopher Tate [Fri, 21 Aug 2015 19:26:07 +0000 (19:26 +0000)]
am
ffe701dc: Present the security patch date in a human-friendly format
* commit '
ffe701dc0e52ee95bf6c54291ed1b574d389019c':
Present the security patch date in a human-friendly format
Christopher Tate [Thu, 20 Aug 2015 23:38:37 +0000 (16:38 -0700)]
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
Selim Cinek [Thu, 20 Aug 2015 19:28:36 +0000 (19:28 +0000)]
am
6ee587a0: am
a5e3aca4: am
dba47d0c: am
19551115: Adapted string length translation limits
* commit '
6ee587a01d74ef0aa813f2057989b59ed061e9df':
Adapted string length translation limits
Selim Cinek [Thu, 20 Aug 2015 19:19:32 +0000 (19:19 +0000)]
am
a5e3aca4: am
dba47d0c: am
19551115: Adapted string length translation limits
* commit '
a5e3aca4f8d49d1b4b092d8353e117ed77ac2e8a':
Adapted string length translation limits
Selim Cinek [Thu, 20 Aug 2015 19:11:58 +0000 (19:11 +0000)]
am
dba47d0c: am
19551115: Adapted string length translation limits
* commit '
dba47d0c7fe5c3b21d4b274cfdd9a84232644395':
Adapted string length translation limits
Selim Cinek [Thu, 20 Aug 2015 19:04:30 +0000 (19:04 +0000)]
am
19551115: Adapted string length translation limits
* commit '
19551115dbb3d848be084462342d41addeb1caf6':
Adapted string length translation limits
Selim Cinek [Thu, 20 Aug 2015 18:53:47 +0000 (11:53 -0700)]
Adapted string length translation limits
Bug:
23298302
Change-Id: Id7651b28bab6e4ff37e94b30d68509ae959c6d70
Maurice Lam [Thu, 20 Aug 2015 00:13:21 +0000 (00:13 +0000)]
am
537b5d6e: am
4d06defe: am
d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
* commit '
537b5d6eaea1d042fa915ef01016cfd8f88161fe':
[Fingerprint] Smaller enrolling ring
Maurice Lam [Thu, 20 Aug 2015 00:08:43 +0000 (00:08 +0000)]
am
4d06defe: am
d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
* commit '
4d06defe88b46ec877e0bb6e1ac095bd650ab9df':
[Fingerprint] Smaller enrolling ring
Maurice Lam [Wed, 19 Aug 2015 23:59:13 +0000 (23:59 +0000)]
am
d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
* commit '
d809de884761f290a94f01f21b5c94e262ec22ea':
[Fingerprint] Smaller enrolling ring
Maurice Lam [Wed, 19 Aug 2015 23:51:30 +0000 (23:51 +0000)]
Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
Geoff Mendal [Wed, 19 Aug 2015 14:31:29 +0000 (14:31 +0000)]
am
1042f538: (-s ours) am
9c989954: (-s ours) am
a206a162: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
1042f538a2769fcd6e70453660872a7a9ca8dc74':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 19 Aug 2015 14:20:55 +0000 (14:20 +0000)]
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
Paul Lawrence [Wed, 19 Aug 2015 14:20:31 +0000 (14:20 +0000)]
am
22ab07ea: am
f7f0a85f: am
1f8fb0f8: Stop crash on repeated enters on virtual keyboard
* commit '
22ab07ea8fbb44eb9f461d0fb31431e05d6671ad':
Stop crash on repeated enters on virtual keyboard
Geoff Mendal [Wed, 19 Aug 2015 14:15:27 +0000 (14:15 +0000)]
am
a206a162: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
a206a162d1a55e7c440c125b504bef83eb361c84':
Import translations. DO NOT MERGE
Paul Lawrence [Wed, 19 Aug 2015 14:15:07 +0000 (14:15 +0000)]
am
f7f0a85f: am
1f8fb0f8: Stop crash on repeated enters on virtual keyboard
* commit '
f7f0a85fe6c7d68a127f42e3528ef81050f8dd0c':
Stop crash on repeated enters on virtual keyboard
Geoff Mendal [Wed, 19 Aug 2015 14:09:16 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Paul Lawrence [Wed, 19 Aug 2015 14:08:36 +0000 (14:08 +0000)]
am
1f8fb0f8: Stop crash on repeated enters on virtual keyboard
* commit '
1f8fb0f8ce1e82266a3a12b3d31b9062cff3fc44':
Stop crash on repeated enters on virtual keyboard
Geoff Mendal [Wed, 19 Aug 2015 14:08:00 +0000 (07:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ab62b9e28b5dd6f8cd2a54e1ae7e015b8730e03
Auto-generated-cl: translation import
Maurice Lam [Wed, 19 Aug 2015 01:30:36 +0000 (18:30 -0700)]
[Fingerprint] Smaller enrolling ring
Make the enrolling progress ring smaller in sw400dp during setup.
Bug:
23216520
Change-Id: I01a862baf9ea3e75e2164d12b7ef13dee5f28c5a
Paul Lawrence [Wed, 12 Aug 2015 20:49:34 +0000 (13:49 -0700)]
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
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.
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
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 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
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
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
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: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
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
OSDN Git Service
