Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
8a97063720 Track change to Conscrypt 
Change way in which an outside caller can get the preferred SSLContext.

Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
 2014-10-31 12:06:09 -07:00
John Spurlock
44c534d88a am 404658ee: Merge "Update 1-bar status bar / qs icons." into lmp-mr1-dev 
* commit '404658eee9ec7c84dc070b018d7fcfa94bb8f83f':
  Update 1-bar status bar / qs icons.
 2014-10-31 19:05:12 +00:00
John Spurlock
404658eee9 Merge "Update 1-bar status bar / qs icons." into lmp-mr1-dev 2014-10-31 19:01:17 +00:00
Chris Wren
310df3127a Clear the initialized flag when resetting the height. 
When the notification was updated within the heads up, touches were being
dropped due to an invalid actual height, after a height reset in the update code.

Bug: 18102199
Change-Id: I6c95d360452665464a868b2bc5ce4f6e104b6652
 2014-10-31 18:55:39 +00:00
John Spurlock
fd9aa5ff03 Update 1-bar status bar / qs icons. 
To make the difference from 2-bars more pronounced.

Also fix a tragic regression in status bar demo icon scale.

Bug: 18019421

Change-Id: I4f4e3fea3ed07de5705ea7a1420deb4ccaa398b0
 2014-10-31 14:51:54 -04:00
Yorke Lee
45d7d17c44 am 14deca6d: am a27afde3: Merge "Fix typo in activity_testing.jd" into lmp-mr1-dev automerge: 2eaf0b0 
* commit '14deca6ded51438439680eebf6d87f5191122e5b':
  Fix typo in activity_testing.jd
 2014-10-31 18:50:50 +00:00
Jason Monk
94cfd9d7c4 Move LOCK_TO_APP_EXIT_LOCKED from System to Secure 
To prepare for controlling from settings.

While here, add lock to app settings to backups.

Bug: 16957435
Change-Id: I059140cd07a7a0d5ceb4e0bfe5e0176cb96629d3
 2014-10-31 14:47:13 -04:00
Yorke Lee
14deca6ded am a27afde3: Merge "Fix typo in activity_testing.jd" into lmp-mr1-dev 
automerge: 2eaf0b0

* commit '2eaf0b0a7b86304a739f91033e9f8f053123e74d':
  Fix typo in activity_testing.jd
 2014-10-31 18:45:18 +00:00
Amith Yamasani
94005240ec Backup and restore battery saver trigger level 
Bug: 17836827
Change-Id: Icb6bf071a0966a8fb9a03fadd0f8b3daa5ad11f8
 2014-10-31 11:35:13 -07:00
Yorke Lee
2eaf0b0a7b am a27afde3: Merge "Fix typo in activity_testing.jd" into lmp-mr1-dev 
* commit 'a27afde31a6412c601f99ef5c7b78fb432f4cad7':
  Fix typo in activity_testing.jd
 2014-10-31 18:32:00 +00:00
Nancy Chen
95e8a67933 Handle MMI for multi-SIM (1/3) 
+ Add Telecomm and Telephony methods for handlePinMMIForSubscriber
+ Add Select Account dialog in Dialer for MMI

Bug: 17917937

Change-Id: I26fdc68a07ca0483bf7a052598fe31b1461fd486
 2014-10-31 11:26:38 -07:00
Yorke Lee
a27afde31a Merge "Fix typo in activity_testing.jd" into lmp-mr1-dev 2014-10-31 18:25:45 +00:00
smain@google.com
515daeead8 am 307bcbe3: am 26bf2f7b: revise helpouts tags to use just one on each page 
* commit '307bcbe31636716b35ef0a4ac420e42fc35d19b1':
  revise helpouts tags to use just one on each page
 2014-10-31 18:03:56 +00:00
smain@google.com
307bcbe316 am 26bf2f7b: revise helpouts tags to use just one on each page 
* commit '26bf2f7b8730d9b4b1459d229207fe55597b000d':
  revise helpouts tags to use just one on each page
 2014-10-31 17:58:09 +00:00
smain@google.com
9b00d795d1 am 0da6b005: revise helpouts tags to use just one on each page 
* commit '0da6b005c1cec9d7a4f6f3259e2deb4a67b37968':
  revise helpouts tags to use just one on each page
 2014-10-31 17:54:48 +00:00
smain@google.com
26bf2f7b87 revise helpouts tags to use just one on each page 
Change-Id: I67e9448567a60dec4b140837d58e46aeccf586a5
 2014-10-31 17:51:41 +00:00
smain@google.com
0da6b005c1 revise helpouts tags to use just one on each page 
Change-Id: I67e9448567a60dec4b140837d58e46aeccf586a5
 2014-10-31 10:45:23 -07:00
Svetoslav
bec22beb99 Save to a PDF file should look like print preview. 
When rendering a PDF file for print preview we take into account
the selected print options such as paper size, orientation, etc
without modifying the document. To print we send the doc in its
original form and the print options so the print service can apply
the necessary transforms in addition to the optional custom options
it supports. When saving to PDF we have to actually change the
document as we act as a print service.

bug:13545980

Change-Id: Icdcecf962bec6ff742cc6015df5af9d9086ce760
 2014-10-31 10:41:34 -07:00
Dianne Hackborn
6edb5c665d Improve low on RAM reporting. 
- Don't print every little native process.
- Print in different sections, so if one is too long we don't get the
  rest truncated in the log.
- Include other info from meminfo -- ksm and free/used/lost summary.

Change-Id: Iea4ec3860212667e195d2b60b3ded23bfec78436
 2014-10-31 10:35:15 -07:00
Baligh Uddin
c132ece63e am b2857d7e: (-s ours) am 9ce5f3d3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'b2857d7e37882b8286f711c9829275fc95ee3ac0':
  Import translations. DO NOT MERGE
 2014-10-31 17:22:26 +00:00
Baligh Uddin
3b581e189a am d9aa0fb3: (-s ours) am 4203242f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'd9aa0fb33a67b0bb4e1bc66fa850188cda7eed89':
  Import translations. DO NOT MERGE
 2014-10-31 17:22:23 +00:00
Baligh Uddin
1286ca6a08 am c5e57877: (-s ours) am 6f259bcb: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'c5e57877d52e151215c5ef4f1f10b5ff878b5beb':
  Import translations. DO NOT MERGE
 2014-10-31 17:22:19 +00:00
Baligh Uddin
25ce0e3dbf am 373cf697: (-s ours) am 1e3f951b: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '373cf6977cf832d504e349e39c4cdf99a9d78b5e':
  Import translations. DO NOT MERGE
 2014-10-31 17:22:09 +00:00
Baligh Uddin
245e5bf195 am 1de1a4d0: (-s ours) am b9109672: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '1de1a4d0751032479edb5bc37d48c4798745e6eb':
  Import translations. DO NOT MERGE
 2014-10-31 17:22:05 +00:00
Baligh Uddin
d1ae84be04 am fe99f64a: (-s ours) am 11fa3ca7: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'fe99f64a853652fa0542013a23363cde82036c49':
  Import translations. DO NOT MERGE
 2014-10-31 17:22:01 +00:00
Baligh Uddin
3a117b47e6 am 6adea48d: (-s ours) am 8900e551: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '6adea48d1ddb91ee613d4a1394f56535fe0a70e7':
  Import translations. DO NOT MERGE
 2014-10-31 17:21:57 +00:00
Baligh Uddin
699cf26491 am 485cc2ff: (-s ours) am f93c7a1f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '485cc2ff66be2b337ebebc307a00f4b000f9d663':
  Import translations. DO NOT MERGE
 2014-10-31 17:21:53 +00:00
Baligh Uddin
d59b521e38 am ae80f360: (-s ours) am 94310005: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'ae80f360b6976d1a11d301609926763d3d5cf76d':
  Import translations. DO NOT MERGE
 2014-10-31 17:21:49 +00:00
Baligh Uddin
ca661b1bf0 am e56f4be2: (-s ours) am 6a9c0710: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'e56f4be2c7bd420ded39381a08ec4eae89e8c15f':
  Import translations. DO NOT MERGE
 2014-10-31 17:21:45 +00:00
Baligh Uddin
45ed8dabd1 am d40b58fd: (-s ours) am eda5438f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'd40b58fd4f9c550a017fa9661d617fed8fee90ea':
  Import translations. DO NOT MERGE
 2014-10-31 17:21:40 +00:00
Baligh Uddin
552cc13e27 am ad7a29d2: (-s ours) am ea678bcc: (-s ours) Import translations. DO NOT MERGE 
* commit 'ad7a29d2607e51143ba05a3fdc40ce36eb6db81f':
  Import translations. DO NOT MERGE
 2014-10-31 17:21:36 +00:00
Baligh Uddin
b2857d7e37 am 9ce5f3d3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '9ce5f3d3da76ad628de1b6c4f155b7b543f35581':
  Import translations. DO NOT MERGE
 2014-10-31 17:14:29 +00:00
Baligh Uddin
d9aa0fb33a am 4203242f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '4203242f223084fa8bd4459fa60e95be4dae659e':
  Import translations. DO NOT MERGE
 2014-10-31 17:14:23 +00:00
Baligh Uddin
c5e57877d5 am 6f259bcb: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '6f259bcb110c0e014bae48f6a3bbfe594c4c5fb9':
  Import translations. DO NOT MERGE
 2014-10-31 17:14:18 +00:00
Baligh Uddin
373cf6977c am 1e3f951b: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '1e3f951b41a79aed2f904b2f33f14748b67ccd75':
  Import translations. DO NOT MERGE
 2014-10-31 17:14:13 +00:00
Baligh Uddin
1de1a4d075 am b9109672: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'b91096729cf92c0de216e0c481912cc563ec035f':
  Import translations. DO NOT MERGE
 2014-10-31 17:14:06 +00:00
Baligh Uddin
fe99f64a85 am 11fa3ca7: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '11fa3ca7a585c4bdbaa30dc28308faae08a591e0':
  Import translations. DO NOT MERGE
 2014-10-31 17:14:00 +00:00
Baligh Uddin
6adea48d1d am 8900e551: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '8900e55113eff52f593407f2f02a3f4744f10c91':
  Import translations. DO NOT MERGE
 2014-10-31 17:13:55 +00:00
Baligh Uddin
485cc2ff66 am f93c7a1f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'f93c7a1f7748eca6b4e6537d52300bb44838f606':
  Import translations. DO NOT MERGE
 2014-10-31 17:13:50 +00:00
Baligh Uddin
ae80f360b6 am 94310005: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '94310005614a97e8feba9649d0b19750bee5bc2b':
  Import translations. DO NOT MERGE
 2014-10-31 17:13:44 +00:00
Baligh Uddin
e56f4be2c7 am 6a9c0710: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '6a9c07102a2a28224b0c4b5911bd8ce14575cde6':
  Import translations. DO NOT MERGE
 2014-10-31 17:13:39 +00:00
Baligh Uddin
d40b58fd4f am eda5438f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'eda5438f6d176e77548953d44c73a8c8c729b288':
  Import translations. DO NOT MERGE
 2014-10-31 17:13:34 +00:00
Baligh Uddin
ad7a29d260 am ea678bcc: (-s ours) Import translations. DO NOT MERGE 
* commit 'ea678bcc4315c78fb0c87c9061315e69d7fb4fa2':
  Import translations. DO NOT MERGE
 2014-10-31 17:13:28 +00:00
Baligh Uddin
9ce5f3d3da Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:07:17 +00:00
Baligh Uddin
4203242f22 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:07:15 +00:00
Baligh Uddin
6f259bcb11 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:07:15 +00:00
Baligh Uddin
1e3f951b41 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:07:11 +00:00
Baligh Uddin
b91096729c Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:07:10 +00:00
Baligh Uddin
11fa3ca7a5 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:07:07 +00:00
Baligh Uddin
8900e55113 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:07:04 +00:00