OSDN Git Service
Victor Chang [Tue, 10 May 2016 14:50:46 +0000 (14:50 +0000)]
Merge "Show a different Root CA string for device owner" into nyc-dev am:
9c31684bbe am:
5ffcedbae9
am:
f906f3c24a
* commit '
f906f3c24a711e02ed17fa0ebf1aa7dc024fabdf':
Show a different Root CA string for device owner
Change-Id: Ida47ae23f8ab6ec97a9535b2e4e2bbcf7673dd03
Victor Chang [Tue, 10 May 2016 14:42:47 +0000 (14:42 +0000)]
Merge "Show a different Root CA string for device owner" into nyc-dev am:
9c31684bbe
am:
5ffcedbae9
* commit '
5ffcedbae97338a8d549592d8149cee98cea61f0':
Show a different Root CA string for device owner
Change-Id: I2b939b8fbbff30b3fef67a334d06c5ee19e901ea
Victor Chang [Tue, 10 May 2016 14:35:53 +0000 (14:35 +0000)]
Merge "Show a different Root CA string for device owner" into nyc-dev
am:
9c31684bbe
* commit '
9c31684bbe449e320e5174a2fcee4ab1900e182c':
Show a different Root CA string for device owner
Change-Id: I85745e298c2e141f55446c8f0460f4745b1b8767
Victor Chang [Tue, 10 May 2016 14:29:38 +0000 (14:29 +0000)]
Merge "Show a different Root CA string for device owner" into nyc-dev
Felipe Leme [Mon, 9 May 2016 20:18:18 +0000 (20:18 +0000)]
Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev am:
8c3b5fa3cf am:
2318d40fc3
am:
00696bbe40
* commit '
00696bbe4077b88494491dbdad697a0cb3826fb5':
Change-Id: I2c67634e59561758a89fbc10b4539cd9c4be8ddf
Felipe Leme [Mon, 9 May 2016 20:18:16 +0000 (20:18 +0000)]
Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev am:
8c3b5fa3cf am:
2af22b9324
am:
542a348f75
* commit '
542a348f75c239111ce64b01a8d7afc844f4c194':
Added title for stand-alone App Data Usage activitiy.
Change-Id: I512d7130837b5cd346ff4b7cdc13013496f84149
Felipe Leme [Mon, 9 May 2016 20:14:04 +0000 (20:14 +0000)]
Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev am:
8c3b5fa3cf
am:
2318d40fc3
* commit '
2318d40fc32643a431502b5b9633674c16f363ac':
Change-Id: I066be3582b1c22ca3c84e6350e0e1fd4eeb2878e
Felipe Leme [Mon, 9 May 2016 20:11:16 +0000 (20:11 +0000)]
Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev am:
8c3b5fa3cf
am:
2af22b9324
* commit '
2af22b9324cefed224c65d2b91b2245246f50552':
Added title for stand-alone App Data Usage activitiy.
Change-Id: I5847f67777f723e7e9c06c0e120dfedb414f40c6
Felipe Leme [Mon, 9 May 2016 20:05:42 +0000 (20:05 +0000)]
Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev
am:
8c3b5fa3cf
* commit '
8c3b5fa3cf14efa3677a3c6cc666900503c15ea0':
Added title for stand-alone App Data Usage activitiy.
Change-Id: If2d8f9673af0150d8a2a10aa0d0f9de0c17f4161
Felipe Leme [Mon, 9 May 2016 20:05:38 +0000 (20:05 +0000)]
Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev
am:
8c3b5fa3cf
* commit '
8c3b5fa3cf14efa3677a3c6cc666900503c15ea0':
Added title for stand-alone App Data Usage activitiy.
Change-Id: Ifb78da77b270aab297ba67037a85a37cc26a769a
Fan Zhang [Mon, 9 May 2016 19:58:58 +0000 (19:58 +0000)]
Merge "Merge "Fix crash when rotating screen in a few screens." into nyc-dev am:
2728874605 am:
3bfe967e5c" into nyc-mr1-dev-plus-aosp
am:
80c8bbd004
* commit '
80c8bbd00449e1d26874c8b6b3f644b648e3e550':
Change-Id: Id97548fd6e31066a4326486f754cf9b01e5ec463
Fan Zhang [Mon, 9 May 2016 19:58:58 +0000 (19:58 +0000)]
Merge "Fix crash when rotating screen in a few screens." into nyc-dev am:
2728874605 am:
8f834a10e0
am:
0638e943d5
* commit '
0638e943d5b7a31390e3cef835affa40895dcccb':
Fix crash when rotating screen in a few screens.
Change-Id: Idff4d69f9618a193712e4a9f2d17646a3b461585
Android Build Merger (Role) [Mon, 9 May 2016 19:53:49 +0000 (19:53 +0000)]
Merge "Merge "Fix crash when rotating screen in a few screens." into nyc-dev am:
2728874605 am:
3bfe967e5c" into nyc-mr1-dev-plus-aosp
Fan Zhang [Mon, 9 May 2016 19:53:39 +0000 (19:53 +0000)]
Merge "Fix crash when rotating screen in a few screens." into nyc-dev am:
2728874605
am:
3bfe967e5c
* commit '
3bfe967e5cab5ddd3d14cebdfd07075d48577082':
Fix crash when rotating screen in a few screens.
Change-Id: I238c48dfa3e78f1c42f4f96de88afb33ab28761d
Fan Zhang [Mon, 9 May 2016 19:53:38 +0000 (19:53 +0000)]
Merge "Fix crash when rotating screen in a few screens." into nyc-dev am:
2728874605
am:
8f834a10e0
* commit '
8f834a10e083df651a3f003e248d58eaacae99ce':
Fix crash when rotating screen in a few screens.
Change-Id: I62a625e0a51e6adda598aa911125a65484358155
TreeHugger Robot [Mon, 9 May 2016 19:50:10 +0000 (19:50 +0000)]
Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev
Fan Zhang [Mon, 9 May 2016 19:48:22 +0000 (19:48 +0000)]
Merge "Fix crash when rotating screen in a few screens." into nyc-dev
am:
2728874605
* commit '
2728874605ef6dc19c901c39663d04c7087e8cda':
Fix crash when rotating screen in a few screens.
Change-Id: Ie31ea933c19597c73b5454fe944dca751435550e
Fan Zhang [Mon, 9 May 2016 19:48:22 +0000 (19:48 +0000)]
Merge "Fix crash when rotating screen in a few screens." into nyc-dev
am:
2728874605
* commit '
2728874605ef6dc19c901c39663d04c7087e8cda':
Fix crash when rotating screen in a few screens.
Change-Id: I5fa56a9910016e76d30a845fa4578f07eb2229e5
Fan Zhang [Mon, 9 May 2016 19:39:58 +0000 (19:39 +0000)]
Merge "Fix crash when rotating screen in a few screens." into nyc-dev
Bill Yi [Mon, 9 May 2016 18:44:05 +0000 (18:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
43a4e5f4ea -s ours am:
7cebc5dbda -s ours
am:
424103ed15 -s ours
* commit '
424103ed15f40993792af786af71171034196e42':
Change-Id: Idb2c36ed37200fe297eb88c122b230c154bf336a
Bill Yi [Mon, 9 May 2016 18:44:04 +0000 (18:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
43a4e5f4ea -s ours am:
3bb61fec65 -s ours
am:
c86d7e5e92 -s ours
* commit '
c86d7e5e92b4cc418bb21585712f9d23dcc4cda8':
Import translations. DO NOT MERGE
Change-Id: Iaa0223354334a884b3d6dd418ec0c26621f9c0e9
Bill Yi [Mon, 9 May 2016 18:36:45 +0000 (18:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
43a4e5f4ea -s ours
am:
7cebc5dbda -s ours
* commit '
7cebc5dbda02c5969c2039f0f64db60c4b350839':
Change-Id: Ied6fcfc4440020abaf09421279f3076e17c57cd4
Bill Yi [Mon, 9 May 2016 18:35:42 +0000 (18:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
43a4e5f4ea -s ours
am:
3bb61fec65 -s ours
* commit '
3bb61fec65643f7d686975b228bb67fd6d47a328':
Import translations. DO NOT MERGE
Change-Id: I1ba1290fd79d538a77c599c1b55404ac4c4689c0
Bill Yi [Mon, 9 May 2016 18:33:54 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
4e5641bfa8 -s ours
am:
8805cb80bb -s ours
* commit '
8805cb80bbaf7a0008689bee2777f881947c4b8c':
Import translations. DO NOT MERGE
Change-Id: Icf3e1a4cda82619ab0f24ea803909f898feb14ba
Bill Yi [Mon, 9 May 2016 18:29:41 +0000 (18:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
43a4e5f4ea -s ours
* commit '
43a4e5f4eaae8a3c886a7f9e66707f8253fecfdb':
Import translations. DO NOT MERGE
Change-Id: I769df4f22077bfe74817edace2cd20cb51bc200d
Bill Yi [Mon, 9 May 2016 18:29:34 +0000 (18:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
43a4e5f4ea -s ours
* commit '
43a4e5f4eaae8a3c886a7f9e66707f8253fecfdb':
Import translations. DO NOT MERGE
Change-Id: I7ba01b3156de2044a05491d88a98681449edf94c
Bill Yi [Mon, 9 May 2016 18:28:26 +0000 (18:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
4e5641bfa8 -s ours
* commit '
4e5641bfa8a27bbcd377e68e2d52d163ddec3011':
Import translations. DO NOT MERGE
Change-Id: I861e2d9156422593779e301b24809bde271d28f5
TreeHugger Robot [Mon, 9 May 2016 18:18:51 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 9 May 2016 18:17:36 +0000 (18:17 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Mon, 9 May 2016 18:17:33 +0000 (18:17 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Fan Zhang [Fri, 6 May 2016 22:39:52 +0000 (15:39 -0700)]
Fix crash when rotating screen in a few screens.
Bug:
26946312
Fixed in the following screens:
Apps > Gear > Special Access > Modify system settings
Apps > Gear > Special Access > Draw over other apps
Apps > Gear > Special Access > Apps with usage access
Language & input > Personal dictionary
Wireless & networks (More) > Android Beam
Change-Id: I0b9bd6c19f710302625dd87989e9d4ce3c96a9a2
Felipe Leme [Mon, 9 May 2016 17:34:39 +0000 (10:34 -0700)]
Added title for stand-alone App Data Usage activitiy.
Change-Id: I031085e6a3c058ed55dfdfe3e7cfecf5a21dddc5
Fixes:
28615889
Victor Chang [Mon, 9 May 2016 10:32:42 +0000 (11:32 +0100)]
Show a different Root CA string for device owner
Bug:
28627835
Change-Id: Iab750dbe7099336b664ef66892cbf2c1b89a9e8e
Jason Monk [Mon, 9 May 2016 13:48:48 +0000 (13:48 +0000)]
Merge "Merge "Dashboard performance work" into nyc-dev am:
04b25af149 am:
4a36e0b3fc" into nyc-mr1-dev-plus-aosp
am:
30b6336d3a
* commit '
30b6336d3a69842ef5a12c022a7bfa8aa2b31eb1':
Change-Id: Ib3a0996c35ea2ffc498d31ac0e93782a0eec36d2
Jason Monk [Mon, 9 May 2016 13:48:48 +0000 (13:48 +0000)]
Merge "Dashboard performance work" into nyc-dev am:
04b25af149 am:
96eedcfdd2
am:
fc5f0d4d20
* commit '
fc5f0d4d20817112d7d8d101f245ba50d45728e8':
Dashboard performance work
Change-Id: I5daad812baf80d27ea6cf097bea15065fa581a7b
Android Build Merger (Role) [Mon, 9 May 2016 13:44:52 +0000 (13:44 +0000)]
Merge "Merge "Dashboard performance work" into nyc-dev am:
04b25af149 am:
4a36e0b3fc" into nyc-mr1-dev-plus-aosp
Jason Monk [Mon, 9 May 2016 13:44:38 +0000 (13:44 +0000)]
Merge "Dashboard performance work" into nyc-dev am:
04b25af149
am:
96eedcfdd2
* commit '
96eedcfdd24a0cda4a56843a55f448367e8518c8':
Dashboard performance work
Change-Id: Ifdb7fa74850c8a4a217ed9f706b2bc3cdcad9be4
Jason Monk [Mon, 9 May 2016 13:44:37 +0000 (13:44 +0000)]
Merge "Dashboard performance work" into nyc-dev am:
04b25af149
am:
4a36e0b3fc
* commit '
4a36e0b3fccb9ebf29582aa1eb22ba47078540ae':
Dashboard performance work
Change-Id: I66492092477f36e46d792f2b512af25374a2273d
Jason Monk [Mon, 9 May 2016 13:40:55 +0000 (13:40 +0000)]
Merge "Dashboard performance work" into nyc-dev
am:
04b25af149
* commit '
04b25af149ba8e4c38cfe17fe9caf246a598e8e3':
Dashboard performance work
Change-Id: Ib85705ab2984d6b8229181709a762dfbcf6341c0
Jason Monk [Mon, 9 May 2016 13:40:54 +0000 (13:40 +0000)]
Merge "Dashboard performance work" into nyc-dev
am:
04b25af149
* commit '
04b25af149ba8e4c38cfe17fe9caf246a598e8e3':
Dashboard performance work
Change-Id: I41c9443c997428924b5ef6df2ad632c06bd416a8
Jason Monk [Mon, 9 May 2016 13:37:45 +0000 (13:37 +0000)]
Merge "Dashboard performance work" into nyc-dev
Bill Yi [Mon, 9 May 2016 13:29:08 +0000 (06:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia72b6a7cc7ef24d407953bdfec981ac8a08d48de
Auto-generated-cl: translation import
Bill Yi [Mon, 9 May 2016 13:22:15 +0000 (06:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6e9f10288cb94440b0f46bd5405ed996168efcbf
Auto-generated-cl: translation import
Bill Yi [Mon, 9 May 2016 12:30:41 +0000 (05:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia3c6b7eb2e6df55f64c39452680a455ef923c33c
Auto-generated-cl: translation import
Felipe Leme [Sat, 7 May 2016 05:35:42 +0000 (05:35 +0000)]
Merge "Implemented onRestrictPowerChanged()." into nyc-dev am:
f135ad5186 am:
c36f19e26f
am:
f62ba989bc
* commit '
f62ba989bcb0077de002dd3361a4e936d2e2b273':
Change-Id: Id1cd0cc87081d7d78c565e7f848928e64d5ab269
Jason Monk [Sat, 7 May 2016 05:35:41 +0000 (05:35 +0000)]
Merge "Fix accessibility description on master clear" into nyc-dev am:
c12521cdcc am:
d682839f62
am:
237741a335
* commit '
237741a3353cc073292e197ff4fdd254b02ced51':
Change-Id: Ie811cdce2bc3fb939022c1d856a6c057c89a648c
Victor Chang [Sat, 7 May 2016 05:35:40 +0000 (05:35 +0000)]
Merge "TrustCredentials listview should be expanded by default" into nyc-dev am:
963c3a4e9f am:
0d16f639bc
am:
717898646d
* commit '
717898646d7d3588b02d1897dd745d3954f65c17':
Change-Id: Id308d61abc574b8c5f072f9b199031a216ada604
Bill Yi [Sat, 7 May 2016 05:35:39 +0000 (05:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
7f1b86e5df -s ours am:
35fb0fb796 -s ours
am:
6e936b232a -s ours
* commit '
6e936b232a8869aca7e8f48c6a429ccf87b74143':
Change-Id: Ia87f041802994f10c6f00aa0748bd8fb7266abf1
Clara Bayarri [Sat, 7 May 2016 05:35:37 +0000 (05:35 +0000)]
Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev am:
2540d66bfe am:
da66986223
am:
1931308353
* commit '
1931308353a5ed16390829cf7f3461a026252e2d':
Change-Id: If20ea382fa02bf64232603e3bf5eaaa970e7bce3
Felipe Leme [Sat, 7 May 2016 05:32:59 +0000 (05:32 +0000)]
Merge "Implemented onRestrictPowerChanged()." into nyc-dev am:
f135ad5186
am:
c36f19e26f
* commit '
c36f19e26f7268b642b6de96b43de7a21ad50ef0':
Change-Id: Id6c8a1505aaa049f2003208a460e7648a8f3f990
Jason Monk [Sat, 7 May 2016 05:32:58 +0000 (05:32 +0000)]
Merge "Fix accessibility description on master clear" into nyc-dev am:
c12521cdcc
am:
d682839f62
* commit '
d682839f62257521c123bfa02ba0163eeaf02f73':
Change-Id: I0ef0f6ba8d094e092c18fadfb490942478a4cd37
Robin Lee [Sat, 7 May 2016 05:32:57 +0000 (05:32 +0000)]
Merge "TrustCredentials listview should be expanded by default" into nyc-dev am:
963c3a4e9f
am:
0d16f639bc
* commit '
0d16f639bc530980835ed242a36f2dba526c0b7b':
Change-Id: Idec602687cea9c047b4c39ae7ddfbb74ace13e60
Bill Yi [Sat, 7 May 2016 05:32:56 +0000 (05:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
7f1b86e5df -s ours
am:
35fb0fb796 -s ours
* commit '
35fb0fb796a3a055002962ee0e1dced5b1e2f856':
Change-Id: If95b92b560dcd97280a1dcd009df87c8786316df
Clara Bayarri [Sat, 7 May 2016 05:32:54 +0000 (05:32 +0000)]
Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev am:
2540d66bfe
am:
da66986223
* commit '
da6698622346ff9171d464422ba2662571551c22':
Change-Id: If2e2ea61506a725d11c529b231fae9018e80ab96
Pavlin Radoslavov [Sat, 7 May 2016 05:32:50 +0000 (05:32 +0000)]
resolve merge conflicts of
8fa3d44 to nyc-mr1-dev am:
3d4a586b80
am:
86f77ab1e2
* commit '
86f77ab1e2287f0221d35aef445592815d8d54ce':
Change-Id: Iab9627f1771abad8357b062816ce30ff8c49f76b
Felipe Leme [Sat, 7 May 2016 05:30:12 +0000 (05:30 +0000)]
Merge "Implemented onRestrictPowerChanged()." into nyc-dev
am:
f135ad5186
* commit '
f135ad5186377bb2525b644c09db92b1d9171656':
Implemented onRestrictPowerChanged().
Change-Id: I936f603cd3feade0c821d0d17814b11317106a31
Jason Monk [Sat, 7 May 2016 05:30:11 +0000 (05:30 +0000)]
Merge "Fix accessibility description on master clear" into nyc-dev
am:
c12521cdcc
* commit '
c12521cdccb14f9f1bd623902d010090ebffc5d4':
Fix accessibility description on master clear
Change-Id: I81313191558700095f6812392cc29c3b655a464a
Victor Chang [Sat, 7 May 2016 05:30:11 +0000 (05:30 +0000)]
Merge "TrustCredentials listview should be expanded by default" into nyc-dev
am:
963c3a4e9f
* commit '
963c3a4e9f06808c098fe3de4aaec5033431f21d':
TrustCredentials listview should be expanded by default
Change-Id: I4edd0c7687a8951456152f334a3a169c817f8ec1
Bill Yi [Sat, 7 May 2016 05:30:11 +0000 (05:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
7f1b86e5df -s ours
* commit '
7f1b86e5df66271371cd2e570b5a32c12cde7fee':
Import translations. DO NOT MERGE
Change-Id: I3ce02f9f42210188d909e48fce22a21ab53ee816
Clara Bayarri [Sat, 7 May 2016 05:30:08 +0000 (05:30 +0000)]
Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev
am:
2540d66bfe
* commit '
2540d66bfed468615d560e93eaaa3621296db0ec':
Remove invisible object in A11y Settings screens' menu
Change-Id: Idcdc2f7d4d1afb6c2c8b5e54a8a5cb5c6a4b3240
pkanwar [Sat, 7 May 2016 05:30:06 +0000 (05:30 +0000)]
resolve merge conflicts of
8fa3d44 to nyc-mr1-dev
am:
3d4a586b80
* commit '
3d4a586b80f6862f3f2452e07afad13f7b380133':
Change-Id: I36f8df9761b48a87bd3c3a255fc5182d141c6172
Pavlin Radoslavov [Sat, 7 May 2016 01:57:18 +0000 (18:57 -0700)]
resolve merge conflicts of
8fa3d44 to nyc-mr1-dev
Change-Id: I1eea61da6904c5d2c181962ff5bac75454d2929d
Felipe Leme [Sat, 7 May 2016 01:22:33 +0000 (01:22 +0000)]
Implemented onRestrictPowerChanged(). am:
cf7d2727c7
am:
e53389309a
* commit '
e53389309a2a8baa00d6835d51318f103a132930':
Implemented onRestrictPowerChanged().
Change-Id: I73d501ce073c61fc8038995928ef47e5386edf2b
Felipe Leme [Sat, 7 May 2016 01:19:46 +0000 (01:19 +0000)]
Implemented onRestrictPowerChanged().
am:
cf7d2727c7
* commit '
cf7d2727c7d3e646d1e3b082e44e18e64a17619b':
Implemented onRestrictPowerChanged().
Change-Id: Ia381be8e0d848e86063e603f9a0b3f9080583adf
Felipe Leme [Tue, 3 May 2016 15:43:08 +0000 (08:43 -0700)]
Implemented onRestrictPowerChanged().
BUG:
28521946
Change-Id: I702e27401f74eee6ce884351ae4e0bc89ec6b8e2
(cherry picked from commit
f79c20500e4e14992f8f470836bf61a6c9d4a1d3)
Felipe Leme [Fri, 6 May 2016 23:46:08 +0000 (23:46 +0000)]
Merge "Implemented onRestrictPowerChanged()." into nyc-dev am:
f135ad5186 am:
51ccb04e01
am:
eb4350c377
* commit '
eb4350c3773b483045cd79589fb8a5e53580619f':
Implemented onRestrictPowerChanged().
Change-Id: I1400957b714c0d88b9acd9e7ed6dcb263df68fd0
Felipe Leme [Fri, 6 May 2016 23:40:45 +0000 (23:40 +0000)]
Merge "Implemented onRestrictPowerChanged()." into nyc-dev am:
f135ad5186
am:
51ccb04e01
* commit '
51ccb04e019bbe375d601e70c86c226d091d10f3':
Implemented onRestrictPowerChanged().
Change-Id: Ibe21a7331e306acc0ad7612ff3c3b86b2bd90727
Felipe Leme [Fri, 6 May 2016 23:33:31 +0000 (23:33 +0000)]
Merge "Implemented onRestrictPowerChanged()." into nyc-dev
am:
f135ad5186
* commit '
f135ad5186377bb2525b644c09db92b1d9171656':
Implemented onRestrictPowerChanged().
Change-Id: I41d98a0483686c05b0b5e88ceb4b589c889a5e22
TreeHugger Robot [Fri, 6 May 2016 23:25:27 +0000 (23:25 +0000)]
Merge "Implemented onRestrictPowerChanged()." into nyc-dev
Jason Monk [Fri, 6 May 2016 19:13:05 +0000 (19:13 +0000)]
Merge "Fix accessibility description on master clear" into nyc-dev am:
c12521cdcc am:
51112c1fce
am:
195a75ac95
* commit '
195a75ac95c6d541669a8331c20b7d92af34d14d':
Fix accessibility description on master clear
Change-Id: I33775f9eaedc9514d424d2ae61863b32f41228e0
Jason Monk [Fri, 6 May 2016 19:08:48 +0000 (19:08 +0000)]
Merge "Fix accessibility description on master clear" into nyc-dev am:
c12521cdcc
am:
51112c1fce
* commit '
51112c1fce3862c66444e92eff3c6865ff4c5931':
Fix accessibility description on master clear
Change-Id: I1d64d2fb5129ba610b7b3ac13e6127d3eda42c1d
Jason Monk [Fri, 6 May 2016 19:03:31 +0000 (19:03 +0000)]
Merge "Fix accessibility description on master clear" into nyc-dev
am:
c12521cdcc
* commit '
c12521cdccb14f9f1bd623902d010090ebffc5d4':
Fix accessibility description on master clear
Change-Id: Ic10e681974fe29769e886777fccd4974e730ad72
Jason Monk [Fri, 6 May 2016 18:33:07 +0000 (18:33 +0000)]
Merge "Fix accessibility description on master clear" into nyc-dev
Jason Monk [Fri, 6 May 2016 18:28:09 +0000 (14:28 -0400)]
Fix accessibility description on master clear
Only include visible views
Change-Id: I271ae87c788e270b15e7ca8758059771cde16d33
Fixes:
28316423
Jason Monk [Fri, 29 Apr 2016 13:25:36 +0000 (09:25 -0400)]
Dashboard performance work
Push more stuff to backround threads (this will cause conditions/suggestions
to load slightly slower than normal content) and cache more info.
Fixes:
28613950
Bug:
28435146
Change-Id: I1080930e8f31c7f12a2d89f266bfd3236979cf40
Fan Zhang [Fri, 6 May 2016 16:02:47 +0000 (16:02 +0000)]
Merge "Update support email/chat display string." into nyc-mr1-dev am:
6d2dd23f85
am:
789b3c9b51
* commit '
789b3c9b51462f3fb589d63ff2d6d8d840d068a5':
Update support email/chat display string.
Change-Id: I571c2b1196786cf0601f1e689478fd11ef017018
Fan Zhang [Fri, 6 May 2016 15:57:35 +0000 (15:57 +0000)]
Merge "Update support email/chat display string." into nyc-mr1-dev
am:
6d2dd23f85
* commit '
6d2dd23f85006dfd32ac3e47f3a6ef8235469d17':
Update support email/chat display string.
Change-Id: Iac53a8886e5c2f8eaa7d7a00078878e240877c9a
Fan Zhang [Fri, 6 May 2016 15:45:30 +0000 (15:45 +0000)]
Merge "Update support email/chat display string." into nyc-mr1-dev
Victor Chang [Fri, 6 May 2016 15:43:28 +0000 (15:43 +0000)]
Merge "TrustCredentials listview should be expanded by default" into nyc-dev am:
963c3a4e9f am:
d48f9cf78e
am:
084b1fc864
* commit '
084b1fc86402b530a1a7f2e76fa058ae8c66bbc8':
TrustCredentials listview should be expanded by default
Change-Id: I4c7134a611b4835b19cc1d6dbed362ac9231b6da
Robin Lee [Fri, 6 May 2016 15:38:39 +0000 (15:38 +0000)]
Merge "TrustCredentials listview should be expanded by default" into nyc-dev am:
963c3a4e9f
am:
d48f9cf78e
* commit '
d48f9cf78e21924306855da02c71f9b65407b117':
TrustCredentials listview should be expanded by default
Change-Id: I8f746b6b53ee17362f998bde5452ff4b447de2c3
Victor Chang [Fri, 6 May 2016 15:33:52 +0000 (15:33 +0000)]
Merge "TrustCredentials listview should be expanded by default" into nyc-dev
am:
963c3a4e9f
* commit '
963c3a4e9f06808c098fe3de4aaec5033431f21d':
TrustCredentials listview should be expanded by default
Change-Id: I5ac13d383e7565acade2272c805e20b67fdc856a
Robin Lee [Fri, 6 May 2016 15:27:41 +0000 (15:27 +0000)]
Merge "TrustCredentials listview should be expanded by default" into nyc-dev
Bill Yi [Fri, 6 May 2016 14:34:22 +0000 (14:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
7f1b86e5df -s ours am:
19f57505a0 -s ours
am:
64b3799ff8 -s ours
* commit '
64b3799ff8f23ebf522feb17485a53f75f1ed173':
Import translations. DO NOT MERGE
Change-Id: Ifa0b81a2096c1a5dc0d396d0fe25fdde67a2b056
Bill Yi [Fri, 6 May 2016 14:34:18 +0000 (14:34 +0000)]
Import translations. DO NOT MERGE am:
fb917b0b5d -s ours
am:
d33940e148 -s ours
* commit '
d33940e1480b8c0062e905dd59e69e1a1d80e796':
Import translations. DO NOT MERGE
Change-Id: I4f6e63345e9e15c618c9dbbf2d5e9ade29a768d6
Bill Yi [Fri, 6 May 2016 14:32:55 +0000 (14:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
7f1b86e5df -s ours
am:
19f57505a0 -s ours
* commit '
19f57505a0a894386f8cd39ead0545e1afcd45dc':
Import translations. DO NOT MERGE
Change-Id: I7858ba5ad58e8954035dfdbf8b197fadf1771ae8
Bill Yi [Fri, 6 May 2016 14:28:10 +0000 (14:28 +0000)]
Import translations. DO NOT MERGE
am:
fb917b0b5d -s ours
* commit '
fb917b0b5d65971420868d139260f5b5d04a45f3':
Import translations. DO NOT MERGE
Change-Id: Icadb4a0a7fd2bfb740ab085ea13b5f38591d81d4
Bill Yi [Fri, 6 May 2016 14:26:57 +0000 (14:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
7f1b86e5df -s ours
* commit '
7f1b86e5df66271371cd2e570b5a32c12cde7fee':
Import translations. DO NOT MERGE
Change-Id: I74aa9a2ba14f127ab8ba758d2a65f24f4076e2a9
TreeHugger Robot [Fri, 6 May 2016 14:16:03 +0000 (14:16 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 6 May 2016 14:14:48 +0000 (14:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Clara Bayarri [Fri, 6 May 2016 13:49:56 +0000 (13:49 +0000)]
Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev am:
2540d66bfe am:
70c5569a18
am:
6d11ab8a93
* commit '
6d11ab8a93bf8ce071898caae3667e7eb1a4c05b':
Remove invisible object in A11y Settings screens' menu
Change-Id: I7d8714a92a16e57c013df71fa3f0fc5c4ee4c24c
Clara Bayarri [Fri, 6 May 2016 13:45:06 +0000 (13:45 +0000)]
Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev am:
2540d66bfe
am:
70c5569a18
* commit '
70c5569a1877d2889e16a9d32133e5293bfacf83':
Remove invisible object in A11y Settings screens' menu
Change-Id: I4addaccd6a0182ff0f2e7303272f0a112cba37e0
Clara Bayarri [Fri, 6 May 2016 13:40:18 +0000 (13:40 +0000)]
Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev
am:
2540d66bfe
* commit '
2540d66bfed468615d560e93eaaa3621296db0ec':
Remove invisible object in A11y Settings screens' menu
Change-Id: I946cec97b7d891f29b8b026d5889511b227512d3
Clara Bayarri [Fri, 6 May 2016 13:36:11 +0000 (13:36 +0000)]
Merge "Remove invisible object in A11y Settings screens' menu" into nyc-dev
Victor Chang [Thu, 14 Apr 2016 21:51:38 +0000 (22:51 +0100)]
TrustCredentials listview should be expanded by default
UI Change for 2-profile case:
1. When both personal and work listview are expanded, half height is allocated for each list view
2. When only one listview is expanded, full height is allocated to the list view
Video can be found at go/trust-cred-split-view
- Use 2 ListView instead of 1 ExpandableListView in order to scoll the list independently
- The ui is not changed for only one or more than 3 profiles.
- Remove TrustedCertificateAdapterCommons, and wrap GroupAdapter by ChildAdapter in order to re-use more codes
- clear mAliasLoaders in onDestroy. (Seems it's a bug.)
- When work mode or fbe locked, force to collapse work list view. User message will be prompted when user press on header
- Groups in GroupAdapter is set synchronously instead of async, since we assume the number of users are fixed during initialization
- DataSet events will go through GroupAdapter to notifiy ChildAdapter
Bug:
28236955
(cherry picked from commit
7dde845544bd74734ac6c444c77d7be7b187873a)
Change-Id: I87293afc56e9cc270c2289111bab6f1809351faf
Clara Bayarri [Fri, 6 May 2016 11:16:49 +0000 (12:16 +0100)]
Remove invisible object in A11y Settings screens' menu
Bug:
28459491
Change-Id: I95250078bf6470d0bd4b6b40f25c13eb6aec93c8
Bill Yi [Fri, 6 May 2016 04:41:59 +0000 (21:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idd3405760f34528ea4561057609d438bd0871a0b
Auto-generated-cl: translation import
Bill Yi [Fri, 6 May 2016 04:35:29 +0000 (21:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iff19a526307de6bd652ba382c1914098f13583e0
Auto-generated-cl: translation import
Bill Yi [Fri, 6 May 2016 03:50:27 +0000 (20:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iee3d28f6bb5f0be3102550f81a5e880a8da98349
Auto-generated-cl: translation import
Victor Chang [Fri, 6 May 2016 03:08:21 +0000 (03:08 +0000)]
Merge "TrustCredentials listview should be expanded by default"
pkanwar [Fri, 6 May 2016 02:05:43 +0000 (02:05 +0000)]
resolve merge conflicts of
de67e0b to nyc-mr1-dev-plus-aosp
am:
7fe0c25f77
* commit '
7fe0c25f77e30c63eb486ae340ff8b1ce82c190c':
The "device type" icons in "Bluetooth device list" screen are not accessible to TalkBack users.
Change-Id: I0f4c21c20d921d9f239b6a4aa3352d9fb76280c8
OSDN Git Service
