Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
253,881 Commits 3 Branches 0 Tags
104f8053370f9e01ac2e8e23bc31d128e5fcc00b
Commit Graph

253881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
e3f8ff01f0 Import translations. DO NOT MERGE 
am: 11f9cf1ed0  -s ours

Change-Id: Ib843122bd1ed9fead05063e7b92a84445f762b76
 2016-09-17 19:56:06 +00:00
Bill Yi
deca08ff76 Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 
am: aef6baae73  -s ours

Change-Id: Iab9e7eccc28ba4c4ee139351a8cbb45b491ff3ef
 2016-09-17 19:53:31 +00:00
Bill Yi
550d7d51c8 Import translations. DO NOT MERGE 
am: e187fc23a9  -s ours

Change-Id: I639aa6e61fac2adabee67f134f81014dec9a256e
 2016-09-17 19:53:28 +00:00
Bill Yi
aad2c64a37 Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 
am: 3c59ef832a  -s ours

Change-Id: I6d4682286ecc57b9018d6cb7634836fa3f23167f
 2016-09-17 19:51:20 +00:00
Bill Yi
b3cae29d29 Import translations. DO NOT MERGE 
am: e7217c397c  -s ours

Change-Id: I519d9b47950eb6e2444ec1ce2ab974eeda5be0de
 2016-09-17 19:51:16 +00:00
TreeHugger Robot
6ade653254 Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 2016-09-17 19:46:10 +00:00
Bill Yi
f92d22155d Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 
am: f17adb2180  -s ours

Change-Id: I54f70a75b501b5a79c7a32eea04936eab045aab8
 2016-09-17 19:45:12 +00:00
Bill Yi
6e72631c58 Import translations. DO NOT MERGE 
am: 5bca1a50c1  -s ours

Change-Id: Ieb57b097f233dde1cd824d40e3cfdfa5527efa4b
 2016-09-17 19:45:10 +00:00
TreeHugger Robot
e6e616d3cd Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 2016-09-17 19:44:02 +00:00
TreeHugger Robot
8bf32cc2bc Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 2016-09-17 19:43:30 +00:00
TreeHugger Robot
aef6baae73 Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 2016-09-17 19:42:49 +00:00
TreeHugger Robot
3c59ef832a Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 2016-09-17 19:41:36 +00:00
Bill Yi
4ee561b42e Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 
am: 346e1932fe  -s ours

Change-Id: I27c1fd70b3ab405a2af0abea5f90ac31b95ba9ec
 2016-09-17 19:37:53 +00:00
Bill Yi
3058f68a18 Import translations. DO NOT MERGE 
am: f2f8d9809e  -s ours

Change-Id: Icc4bbfa1a8d77402b806df006115c6d6c5aa77b6
 2016-09-17 19:37:49 +00:00
TreeHugger Robot
f17adb2180 Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 2016-09-17 19:36:42 +00:00
TreeHugger Robot
346e1932fe Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 2016-09-17 19:32:30 +00:00
TreeHugger Robot
c353ab4a6d Merge "Show hamburger menu if the activity is top level setting." into nyc-mr1-dev 2016-09-17 15:40:24 +00:00
Bill Yi
f2f8d9809e Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 31516661
Change-Id: Ia804bc985bd883de3e9aea170d2c9bbff3f53ee4
 2016-09-17 00:04:32 -07:00
Bill Yi
870fa8fec7 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 31516661
Change-Id: I830397cb29a3bd15cec9f3687de09bb108ea6872
 2016-09-17 00:01:37 -07:00
Bill Yi
5bca1a50c1 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 31516661
Change-Id: I15ae676cc9d67de16e382ad7ee4b0bafc2079f42
 2016-09-16 23:35:29 -07:00
Bill Yi
e7217c397c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 31516661
Change-Id: Ibc5febf6eb22c630b2eb9458411a60bd8d4af0f0
 2016-09-16 23:16:20 -07:00
Bill Yi
e187fc23a9 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 31516661
Change-Id: I83dbc65f2c555af4ef91fa5a30ec4334254fadbb
 2016-09-16 23:08:30 -07:00
Bill Yi
ef41272507 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 31516661
Change-Id: I13357cc99cba5d5c6208fd28ebc4f58b3027e5f5
 2016-09-16 23:05:41 -07:00
Bill Yi
11f9cf1ed0 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 31516661
Change-Id: Ic09face2a96d33b59f9dd9f547858f8d67d8cc7f
 2016-09-16 23:02:16 -07:00
Bill Yi
5ca50ed24a Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 
am: 5883cd4670  -s ours

Change-Id: Ifd86cbcb2b344dfa2d82910e110d7867476ba11d
 2016-09-17 03:37:28 +00:00
Bill Yi
9072858fee Import translations. DO NOT MERGE 
am: 98c2fc559b  -s ours

Change-Id: Iedc4d54c52ae9ea792acd5586d4b23a5f08a96da
 2016-09-17 03:37:26 +00:00
TreeHugger Robot
5883cd4670 Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 2016-09-17 03:30:05 +00:00
Fan Zhang
f311b74b8f Show hamburger menu if the activity is top level setting. 
Bug: 27584874
Test: manual inspection (automated test coming later)

This makes it possible to show menu icon when top level setting activity
is open from outside of Settings (eg, quick setting tiles)

Change-Id: Ic8e755f43b3f6a92118657741b37e09dbc2b53d0
 2016-09-16 18:26:36 -07:00
Jeff Sharkey
ec0933c4bf Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 am: db901ee296 
am: 6495c5ef30

Change-Id: I0e5463ab40cbea425badf360388d316a50299dd0
 2016-09-17 00:34:52 +00:00
Svetoslav Ganov
b9f84fb6f4 Add access tracker to renamed accounts 
We are adding access tracker to accounts cached by the
account manager to know when a process saw the account
to white list it for future access. The bug here was
that we didn't return the account from the cache but
the tracker is added when the account is cached. Now
the contract is that inserting an account in the cache
returns the instrumented account which is inteded to
be returned to clients.

bug:28163381
bug:31456742

Change-Id: I5acac1f77a9077b35c5e4892e40d2ab38f3bfc63
 2016-09-16 17:29:09 -07:00
Android Build Merger (Role)
c2145f0607 Merge "Merge "Add build target for generating navtree json with all inherited members." into nyc-dev am: 3d47dc03db am: c7175a0d7d" into nyc-mr1-dev 2016-09-17 00:27:29 +00:00
Dirk Dougherty
98029587e7 Merge "Add build target for generating navtree json with all inherited members." into nyc-dev am: 3d47dc03db 
am: c7175a0d7d

Change-Id: I8b172792e5a7b79dfc3206c633bb0a4bc9c34956
 2016-09-17 00:26:57 +00:00
Android Build Merger (Role)
0fd2acc7d8 Merge "Add build target for generating navtree json with all inherited members. am: 7d47b55cc0 am: 33684f217b" into nyc-mr1-dev 2016-09-17 00:24:52 +00:00
Dirk Dougherty
b63d9d8aad Add build target for generating navtree json with all inherited members. am: 7d47b55cc0 
am: 33684f217b

Change-Id: I34040be694eb1c82b2feb977c6389890d7755d0d
 2016-09-17 00:24:10 +00:00
Jeff Sharkey
6495c5ef30 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 
am: db901ee296

Change-Id: I683e1c33b8058a597163aacfc744df339188cd37
 2016-09-17 00:23:53 +00:00
TreeHugger Robot
44f4c4fa27 Merge "Docs: Note that a Surface acts like a weak reference" into nyc-mr1-dev 2016-09-17 00:22:53 +00:00
Jeff Sharkey
db901ee296 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff 
am: 33ada2e927

Change-Id: I9b6d2b6f9101e7e7610f191cd4927d568ae0476a
 2016-09-17 00:13:26 +00:00
Bill Yi
98c2fc559b Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 31516661
Change-Id: I8e9bd0e34a8cdf9263456a370c0b260cab094b27
 2016-09-16 17:12:28 -07:00
Dirk Dougherty
c7175a0d7d Merge "Add build target for generating navtree json with all inherited members." into nyc-dev 
am: 3d47dc03db

Change-Id: I2e0d2db8cd6d276ee4fb3045837ee455c78c2407
 2016-09-16 23:58:05 +00:00
Dirk Dougherty
33684f217b Add build target for generating navtree json with all inherited members. 
am: 7d47b55cc0

Change-Id: Ib9279dc1ec2149a535f4b7a4843612da6af27650
 2016-09-16 23:58:02 +00:00
Phil Weaver
110357c0b3 Merge "Fix bug in magnification coordinate calculation." into nyc-mr1-dev 2016-09-16 23:47:24 +00:00
Dirk Dougherty
3d47dc03db Merge "Add build target for generating navtree json with all inherited members." into nyc-dev 2016-09-16 23:44:23 +00:00
Jeff Sharkey
33ada2e927 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 
am: fc1c0f9dff

Change-Id: I4c197be781f981af568ae98e1c3358ce8572e39a
 2016-09-16 23:40:13 +00:00
Jeff Sharkey
fc1c0f9dff Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 
am: afcd1135c3

Change-Id: I9cbfddb282796b2425a0da76760bde0ebd8336b4
 2016-09-16 23:31:45 +00:00
Joe Fernandez
5d8f0df017 Merge "docs: Clarification for location permissions and location hardware" into nyc-dev am: 5195e8288d 
am: 4ef51f5923

Change-Id: If22a433866684a8c786efece04d6753dedc5c3e0
 2016-09-16 23:31:29 +00:00
Jeff Sharkey
afcd1135c3 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 
am: df42d732f8

Change-Id: Ib7efd9dacf476d8a717456d8e6fc7ee617483d17
 2016-09-16 23:14:51 +00:00
Josh Horwich
8960d0a712 Docs: Fix manifest example for ARC 
Simply add "android:" qualifier to required attribute.

Bug: 31554344
Test: None

Change-Id: I13ef9c8614d76bd99f9d7b69d3ea8319843e979a
 2016-09-16 16:12:16 -07:00
Joe Fernandez
9f858dd3de docs: Clarification for location permissions and location hardware am: 1294dde183 
am: f157e31a6c

Change-Id: I71593836a6d7aeaedcb721c010a75d33fca94545
 2016-09-16 23:07:57 +00:00
Joe Fernandez
4ef51f5923 Merge "docs: Clarification for location permissions and location hardware" into nyc-dev 
am: 5195e8288d

Change-Id: I818e87dd0105ddc061f797c07396644841b6e516
 2016-09-16 22:59:53 +00:00
Joe Fernandez
f157e31a6c docs: Clarification for location permissions and location hardware 
am: 1294dde183

Change-Id: I8c203d879fc3bfa2f7061c28d280ad8fa4557fd0
 2016-09-16 22:59:50 +00:00