Adam Lesinski
985d10296a
am fba915be: Merge "Merge dex2oat with app being installed" into mnc-dev
...
* commit 'fba915be162f5e32e1a614c5497ef08b216a5b3a':
Merge dex2oat with app being installed
2015-06-30 23:30:15 +00:00
Amith Yamasani
856bc3bd12
am 5bfbc07f: am a8c4db48: Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev
...
* commit '5bfbc07fc761009e2b4116d47d6bda7460061840':
Only allow admin users to adopt sd card as internal storage.
2015-06-30 23:26:32 +00:00
Adam Lesinski
fba915be16
Merge "Merge dex2oat with app being installed" into mnc-dev
2015-06-30 23:16:23 +00:00
Amith Yamasani
5bfbc07fc7
am a8c4db48: Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev
...
* commit 'a8c4db48c26634836ade77f3f8f0403089245f9c':
Only allow admin users to adopt sd card as internal storage.
2015-06-30 23:13:51 +00:00
Amith Yamasani
a8c4db48c2
Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev
2015-06-30 23:00:28 +00:00
Amith Yamasani
350274040e
Only allow admin users to adopt sd card as internal storage.
...
Bug: 21883016
Change-Id: I11ca324ab74ce2a8bf13064b4c7735aea132c562
2015-06-30 14:23:54 -07:00
Jason Monk
a5dc01a2b1
am f1d70b5f: am a8af51b2: Merge "Handle adjust volume user restriction" into mnc-dev
...
* commit 'f1d70b5f7da3929afbc27494539c8e1bbafd77c4':
Handle adjust volume user restriction
2015-06-30 21:22:35 +00:00
Jason Monk
f1d70b5f7d
am a8af51b2: Merge "Handle adjust volume user restriction" into mnc-dev
...
* commit 'a8af51b2d8706455c8c541a4773c883341a5b73c':
Handle adjust volume user restriction
2015-06-30 20:21:50 +00:00
Jason Monk
a8af51b2d8
Merge "Handle adjust volume user restriction" into mnc-dev
2015-06-30 20:08:15 +00:00
Jason Monk
72965ad53b
Handle adjust volume user restriction
...
- Finish all do not disturb pages immediately
- Disable relevant items in Sounds & notification
Bug: 21642285
Change-Id: I8de9bd10b8cea8adaa306b1ae388ab7d1ccc4e7e
2015-06-30 19:21:10 +00:00
Makoto Onuki
86826083b6
am 3ff8ce1d: am a2bd2eac: Merge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev
...
* commit '3ff8ce1d9de9efcf88981f6c9b4b63497be8ae7f':
Make sure Fragments are public for FragMan to instantiate
2015-06-30 17:28:37 +00:00
Makoto Onuki
3ff8ce1d9d
am a2bd2eac: Merge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev
...
* commit 'a2bd2eacc3f2688feffafa6ca7050141ad4675eb':
Make sure Fragments are public for FragMan to instantiate
2015-06-30 16:54:11 +00:00
Makoto Onuki
a2bd2eacc3
Merge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev
2015-06-30 16:40:58 +00:00
Jason Monk
8d4b924366
am e6cbdf19: am e6a0bee5: Merge "Fix crash in ignore optimizations dialog" into mnc-dev
...
* commit 'e6cbdf19b556436ed6571f2f828ed7c1374f90ce':
Fix crash in ignore optimizations dialog
2015-06-30 14:45:41 +00:00
Jason Monk
e6cbdf19b5
am e6a0bee5: Merge "Fix crash in ignore optimizations dialog" into mnc-dev
...
* commit 'e6a0bee557c8f2ceaa25cd8287511b55479e7293':
Fix crash in ignore optimizations dialog
2015-06-30 14:32:58 +00:00
Rubin Xu
cf0f3c130f
am 4421438c: am 02c7e95f: Merge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev
...
* commit '4421438c50d076ee91b8fc333fa23c7d4dc424ed':
No longer use ExternalStorageFormatter to format external storage
2015-06-30 14:21:06 +00:00
Jason Monk
e86de04dd6
am a992bb3d: am 6799ef42: Merge "Reduce jank in wifi settings" into mnc-dev
...
* commit 'a992bb3dfb94705053ca91ac9d31e8a530d2b984':
Reduce jank in wifi settings
2015-06-30 14:21:05 +00:00
Jason Monk
e6a0bee557
Merge "Fix crash in ignore optimizations dialog" into mnc-dev
2015-06-30 14:20:58 +00:00
Jason Monk
d5884c5023
Fix crash in ignore optimizations dialog
...
Launch it like a dialog, because it is one.
Bug: 22181580
Change-Id: Ibeda8506cfb7a9a9d60f70462a4e03972b38f8aa
2015-06-30 10:17:25 -04:00
Rubin Xu
4421438c50
am 02c7e95f: Merge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev
...
* commit '02c7e95fd4e03d7356def00f68e6e93f4da87f73':
No longer use ExternalStorageFormatter to format external storage
2015-06-30 14:12:39 +00:00
Jason Monk
a992bb3dfb
am 6799ef42: Merge "Reduce jank in wifi settings" into mnc-dev
...
* commit '6799ef423b18c37c9a8a3684159dd185f61a0931':
Reduce jank in wifi settings
2015-06-30 14:12:38 +00:00
Rubin Xu
02c7e95fd4
Merge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev
2015-06-30 14:05:32 +00:00
Jason Monk
6799ef423b
Merge "Reduce jank in wifi settings" into mnc-dev
2015-06-30 14:03:05 +00:00
Jorim Jaggi
6c8e650308
am ea53bfcd: am d9bd96b3: Add setting to disable screenshot separately (2/2)
...
* commit 'ea53bfcddf8c8b37a154bcbdcbbec2ee71b109d9':
Add setting to disable screenshot separately (2/2)
2015-06-30 00:49:24 +00:00
Jorim Jaggi
ea53bfcddf
am d9bd96b3: Add setting to disable screenshot separately (2/2)
...
* commit 'd9bd96b3094039fdcb8c76042a6f2dc21d6c7875':
Add setting to disable screenshot separately (2/2)
2015-06-30 00:35:45 +00:00
Adam Lesinski
4444fb85a9
Merge dex2oat with app being installed
...
Bug:22008744
Change-Id: Id87fe215760202e2969c27d686fa8ba106b00754
2015-06-29 14:56:01 -07:00
Jorim Jaggi
d9bd96b309
Add setting to disable screenshot separately (2/2)
...
Bug: 22063668
Change-Id: I85b255ac114184e0edbd71010d517b337ad935e5
2015-06-29 14:50:45 -07:00
Jorim Jaggi
aa6a23a9b2
am ea673970: am 1e7b8f86: Fix userId for credentials from managed profiles
...
* commit 'ea673970e16b49f28d7f39c8b4993f186e561d6d':
Fix userId for credentials from managed profiles
2015-06-29 21:23:26 +00:00
Jorim Jaggi
ea673970e1
am 1e7b8f86: Fix userId for credentials from managed profiles
...
* commit '1e7b8f86d8aa46d2ed24b75adb453833ef2d1a88':
Fix userId for credentials from managed profiles
2015-06-29 21:04:41 +00:00
Jorim Jaggi
1e7b8f86d8
Fix userId for credentials from managed profiles
...
Bug: 22094377
Change-Id: Ia98d0e386d4c56f3eb502ff11f86b0fd7dadea3c
2015-06-29 20:34:27 +00:00
Jason Monk
7a63a8f08b
am 2d6445d4: am 312c90c8: Merge "Remove char limit from owner info" into mnc-dev
...
* commit '2d6445d4a1b99f95dd5f11561fc9392c7c9eb407':
Remove char limit from owner info
2015-06-29 20:16:18 +00:00
Jason Monk
2d6445d4a1
am 312c90c8: Merge "Remove char limit from owner info" into mnc-dev
...
* commit '312c90c8caa4fdc59e9a4bd9f900d23ec7274495':
Remove char limit from owner info
2015-06-29 20:04:49 +00:00
Jason Monk
312c90c8ca
Merge "Remove char limit from owner info" into mnc-dev
2015-06-29 19:52:51 +00:00
Jason Monk
d79984c9e4
Remove char limit from owner info
...
Bug: 21959734
Change-Id: I21854309ca390cb126ba50feaa56fb9a35b862e1
2015-06-29 15:42:41 -04:00
Jason Monk
9b9e75d019
am d1c770f0: am 898acde0: Merge "Handle rotation (or refresh) before callback is received" into mnc-dev
...
* commit 'd1c770f023c3d428b80c92277d45dcfa0ab83190':
Handle rotation (or refresh) before callback is received
2015-06-29 19:19:51 +00:00
Jason Monk
d1c770f023
am 898acde0: Merge "Handle rotation (or refresh) before callback is received" into mnc-dev
...
* commit '898acde0602b00599d48161c47fc0762a5e4d75f':
Handle rotation (or refresh) before callback is received
2015-06-29 19:09:16 +00:00
Jason Monk
898acde060
Merge "Handle rotation (or refresh) before callback is received" into mnc-dev
2015-06-29 18:55:29 +00:00
Jason Monk
d0d7b924cb
Handle rotation (or refresh) before callback is received
...
Make sure we unregister the old receiver
Bug: 22160603
Change-Id: I798ca07dd65711caa4d3295b7ad811ca2fc69c1d
2015-06-29 14:43:19 -04:00
Jason Monk
55dd8869db
Reduce jank in wifi settings
...
- Fix view recycling for AccessPointPreferences by adding a dummy
during initial inflation
- Cut down on what is done during onBindView and refresh()
- Try to re-use AccessPointPreferences when possible
Some jank still occurs when scan results come in, but it is less
than before.
Bug: 16518752
Change-Id: I2619303281dd50aa3864783c49738ae9f221834a
2015-06-29 13:47:14 -04:00
Geoff Mendal
672649b854
am 84a66c65: (-s ours) am 21e00f98: (-s ours) Import translations. DO NOT MERGE
...
* commit '84a66c6511910aaa1aa403aa1729eab3ec55cb7b':
Import translations. DO NOT MERGE
2015-06-29 15:17:21 +00:00
Geoff Mendal
84a66c6511
am 21e00f98: (-s ours) Import translations. DO NOT MERGE
...
* commit '21e00f9819f48d33958a1bda87511e38809eb9f3':
Import translations. DO NOT MERGE
2015-06-29 15:06:30 +00:00
Geoff Mendal
21e00f9819
Import translations. DO NOT MERGE
...
Change-Id: Ib4c36b177018329faa9359c2d02f3ebc33bb1134
Auto-generated-cl: translation import
2015-06-29 07:50:47 -07:00
Sanket Padawe
4e484afa12
am d52bd38d: am 52dce9d3: Merge "Hide EAP SIM, AKA & AKA\' choices in wifi Settings if device doesn\'t support." into mnc-dev
...
* commit 'd52bd38d055cfa44049f80aed700228968860c54':
Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support.
2015-06-28 03:09:39 +00:00
Sanket Padawe
d52bd38d05
am 52dce9d3: Merge "Hide EAP SIM, AKA & AKA\' choices in wifi Settings if device doesn\'t support." into mnc-dev
...
* commit '52dce9d3340da087fadf4689a07c943d9a121071':
Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support.
2015-06-28 02:57:36 +00:00
Sanket Padawe
52dce9d334
Merge "Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support." into mnc-dev
2015-06-28 02:45:48 +00:00
Yohei Yukawa
cf1a9a1ada
am 22963d92: am 473440d7: Merge "Dont crash if there is no spellchecker" into mnc-dev
...
* commit '22963d9224e594fd8ba50d7ab33d448d910476a6':
Dont crash if there is no spellchecker
2015-06-27 22:02:05 +00:00
Yohei Yukawa
22963d9224
am 473440d7: Merge "Dont crash if there is no spellchecker" into mnc-dev
...
* commit '473440d79b1b93fac06cba220f70181492855763':
Dont crash if there is no spellchecker
2015-06-27 21:49:05 +00:00
Yohei Yukawa
473440d79b
Merge "Dont crash if there is no spellchecker" into mnc-dev
2015-06-27 21:40:53 +00:00
Adam Lesinski
207ec04b76
am 92f9c17f: am 18ae8512: Merge "Report real wifi running time in Power Details" into mnc-dev
...
* commit '92f9c17fe74bea7a9ec00d58dffc8164735efb13':
Report real wifi running time in Power Details
2015-06-27 01:30:21 +00:00
Adam Lesinski
92f9c17fe7
am 18ae8512: Merge "Report real wifi running time in Power Details" into mnc-dev
...
* commit '18ae8512b9357907f0411013aec46209aa40a384':
Report real wifi running time in Power Details
2015-06-27 01:17:51 +00:00