drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,024 Commits 1 Branch 0 Tags
Commit Graph

155024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
234e25fbda Import translations. DO NOT MERGE 
Change-Id: Ia6e19184b9f8f2ef31f1ea94263fe1090333837e
Auto-generated-cl: translation import
 2014-11-24 08:51:30 -08:00
Jeff Brown
3d110b2391 Make WallpaperService watch the actual display state. 
Bug: 18471411
Change-Id: Ie9d2e70e4e105dfbb2cb4d9726f632bcf2cc0a31
 2014-11-22 03:25:39 +00:00
Joe Fernandez
fbdfdef43d am 9034ead0: am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources 
* commit '9034ead0ba8ce1d0c8c162d9516ca188b783d407':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
 2014-11-21 20:37:02 +00:00
Joe Fernandez
9034ead0ba am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources 
* commit '5b94d00b896b2bbc71a0c925e92e8c7e08978975':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
 2014-11-21 20:32:03 +00:00
Joe Fernandez
5b94d00b89 docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources 
- Chinese pages are showing Japanese (not good)
- Chinese resource page is not rendering because of bad video links

Change-Id: Ia4508c2db85b9cbd5bdad34ae8bedc411df98360
 2014-11-21 20:27:13 +00:00
Scott Rowe
63108ee362 am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 
* commit '02cb1fe6c4a12c15ef44c2982fcab71ba6346c9b':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
 2014-11-21 17:50:17 +00:00
Scott Rowe
02cb1fe6c4 am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 
* commit '14f78ed7b8c374017fa37f29cfed2208a072ea28':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
 2014-11-21 17:41:06 +00:00
Scott Rowe
14f78ed7b8 Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 2014-11-21 17:34:29 +00:00
Jeff Brown
694c1d2b2d Merge "Support keeping activities resumed while dozing." into lmp-sprout-dev 2014-11-21 00:54:05 +00:00
Jeff Brown
fbe96706bb Support keeping activities resumed while dozing. 
If the lock screen is not shown, then let activities keep running
while dozing.  This is important to support ambient mode on watches
since it allows the home app to keep running.

To make this possible, we need to inform the activity manager about
the exact wakefulness state, not just the overall boolean
interactive state.

Bug: 18284212
Change-Id: Ia35c99127ce51ffc178f3a2f51fca67d24061c71
 2014-11-20 16:49:18 -08:00
Geoffrey Borggaard
90ed95faed am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev 
* commit 'c3f5d7183a21cb081bab1a6bca3fc115523e4e78':
  Fix null handling in proxies.
 2014-11-20 20:59:00 +00:00
Geoffrey Borggaard
c3f5d7183a Merge "Fix null handling in proxies." into lmp-dev 2014-11-20 20:55:26 +00:00
Ricardo Cervera
8837ce2ce3 am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. 
* commit 'e9b5dfc0588010a97a561d3255ad35d10db000bc':
  docs: Fixes to the Data Layer Wear class.
 2014-11-20 20:37:34 +00:00
Ricardo Cervera
161dce465e am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev 
* commit 'c8543b4f4661902371c16932faa109befb921345':
  docs: Fixes to the Data Layer Wear class.
 2014-11-20 20:37:30 +00:00
Ricardo Cervera
e9b5dfc058 am 25bf00bc: docs: Fixes to the Data Layer Wear class. 
* commit '25bf00bceed5b22f8750e68a45beb944a80773a8':
  docs: Fixes to the Data Layer Wear class.
 2014-11-20 19:56:11 +00:00
Ricardo Cervera
25bf00bcee docs: Fixes to the Data Layer Wear class. 
Bug: 17917638
Bug: 17917145
Bug: 17931937
Bug: 17933032
Bug: 16899307

Change-Id: Iee9fd0a44cd40b9860cf242cbdaabac409882a15
(cherry picked from commit eff209d2c40221d2f9be2fd6b0c9cde51dd5362b)
 2014-11-20 19:51:25 +00:00
Ricardo Cervera
c8543b4f46 Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev 2014-11-20 19:49:53 +00:00
Geoffrey Borggaard
79adc958e5 Fix null handling in proxies. 
ProxyInfo.getPacFileUrl() can not be null.  It will be equal to
Uri.EMPTY.  Checking for null was causing global proxies to never be
disabled.  Or more accurately, global proxies would be disabled, but
would reappear after a reboot.

ProxyInfo.getExclusionListByString() can be null.  If no
exclusion list was specified, the proxy settings would not be
successfully saved, they would disappear after reboot.

Bug: 18453223
Change-Id: I1c27e5dca5b9664bb7468ea909bff489fa110a07
 2014-11-20 19:48:20 +00:00
Filip Gruszczynski
96c5d37fb5 Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev 2014-11-20 15:51:09 +00:00
Deepanshu Gupta
cb09bc45c5 Fix typos in previous bugfixes. 
The commits 2c9fbdd and 12b6d29 introduced minor bugs. This change fixes
them.
 2014-11-20 13:35:47 +00:00
Andrew Solovay
b5b9c9b589 am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs 
* commit 'c79173c7da4de4d809d3b5492e5433393193a652':
  docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
 2014-11-20 01:46:14 +00:00
Elliott Hughes
4db3fc1c28 am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices. 
* commit '03c80408d2651bcfaa707233cd0b54b7a8ca57ad':
  Fix and be more explicit about plurals best practices.
 2014-11-20 01:40:00 +00:00
Andrew Solovay
c79173c7da am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs 
* commit '05282133c7491fd2b5e8f3da05408ff0165df526':
  docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
 2014-11-20 01:32:30 +00:00
Andrew Solovay
05282133c7 Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs 2014-11-20 01:27:51 +00:00
Elliott Hughes
03c80408d2 am 6c43e6b5: Fix and be more explicit about plurals best practices. 
* commit '6c43e6b54d7d540e579d2dff8c9cff981cb5ca4a':
  Fix and be more explicit about plurals best practices.
 2014-11-20 01:21:40 +00:00
Elliott Hughes
6c43e6b54d Fix and be more explicit about plurals best practices. 
The "one" case should always include %d. Say so, and fix our examples.
Also make it clear that developers should always provide exactly "one"
and "other".

Bug: 18429565

(cherry picked from commit 1fe7d496db1ddc73289e6aae11f4dd4a970141d5)

Change-Id: I89656c74b7dfd91584e1bb6d0a3f2da1dda81079
 2014-11-19 16:38:39 -08:00
Dirk Dougherty
4d82f8ad32 am ef629f1f: am a79acc03: Doc change: localized content. 
* commit 'ef629f1f9feada596a0c41b55daa0e859e24312e':
  Doc change: localized content.
 2014-11-20 00:08:05 +00:00
Dirk Dougherty
ef629f1f9f am a79acc03: Doc change: localized content. 
* commit 'a79acc0315d33080527b9fb48ba063fb4104de37':
  Doc change: localized content.
 2014-11-20 00:02:06 +00:00
Dirk Dougherty
a79acc0315 Doc change: localized content. 
Change-Id: I5440fe8d6003bdd8e3cb4c44bacea422f322c33b
 2014-11-19 23:44:05 +00:00
smain@google.com
6e08d30da4 am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs 
* commit '555d6e700a84018e1af2e7cf6c58ca00f0611f5d':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
 2014-11-19 23:14:10 +00:00
smain@google.com
555d6e700a am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs 
* commit '2411fe88d7b11f628e5338bd8f314c98a9d45bb4':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
 2014-11-19 23:10:06 +00:00
smain@google.com
2411fe88d7 Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs 2014-11-19 23:06:27 +00:00
Quddus Chong
a1e1890797 am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. 
* commit '8428c114ab58d7a5a11c72583a49d3e1d036623c':
  docs: Added link to CarExtender class from Auto Getting Started doc.
 2014-11-19 23:05:59 +00:00
Deepanshu Gupta
ddc83dfa8f am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev 
* commit '4104abf875e16ad54c248ce602e573d2144732dd':
  Fix setTextAppearance for styles with dots.
 2014-11-19 23:00:43 +00:00
Deepanshu Gupta
a0bc2e7e3c am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev 
* commit '455654cffdaebcbbd4fa33de5bb18fa2752d6c9a':
  LayoutLib: Stub AM/PM keycodes in Time Picker.
 2014-11-19 23:00:39 +00:00
Quddus Chong
8428c114ab am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. 
* commit '9b822b96aaf16ac4ad8e5a1c8da998fba2f3f404':
  docs: Added link to CarExtender class from Auto Getting Started doc.
 2014-11-19 22:58:30 +00:00
Andrew Solovay
9ab79ccd34 docs: Bugfix & minor cleanup for "Providing Messaging for Auto" 
Fixeds the gradle dependency line. Also added in Javadoc links for the
various support classes and methods, and other minor cleanup. See
first comment for doc stage location.

bug: 18439090

Change-Id: I7ccc892f38a644d68abc6d56d8d4377df5f864b0
 2014-11-19 14:48:52 -08:00
Deepanshu Gupta
4104abf875 Merge "Fix setTextAppearance for styles with dots." into lmp-dev 2014-11-19 22:30:20 +00:00
Deepanshu Gupta
455654cffd Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev 2014-11-19 22:29:54 +00:00
Geoffrey Borggaard
db1e7fa097 Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev 
automerge: e4590cf

* commit 'e4590cff5bbe581a1326abe68115b551585c43ff':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-19 20:50:12 +00:00
Geoffrey Borggaard
e4590cff5b Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev 2014-11-19 19:56:48 +00:00
xinhe
62a22d5b1f resolved conflicts for merge of 046f3843 to lmp-sprout-dev(DO NOT MERGE) 
The change is already in MR1 branch

Change-Id: I4ae35a8f76fdc2d4b1cdf2773dc27ff2da85b5ff
 2014-11-19 11:48:43 -08:00
Quddus Chong
9b822b96aa docs: Added link to CarExtender class from Auto Getting Started doc. 
Change-Id: Ia446c969a7108d8964c22958cd501b083a84b9d3
 2014-11-19 11:37:18 -08:00
Geoffrey Borggaard
ba45b96a37 Setting ADB_ENABLED may result in a SecurityException. 
If the restriction UserManager.DISALLOW_DEBUGGING_FEATURES is enforced,
then any attempt to set ADB_ENABLED will result in a SecurityException.
This can result in the device not being able to boot.
Bug: 18433477

Change-Id: I21e4b406ad0fa89b7d4b678eac1baf212a3c7acd
 2014-11-19 14:26:08 -05:00
Filip Gruszczynski
6eafa902cb SwipeDismissLayout makes activity opaque only after entry animation ends. 
Bug: 18340863
Change-Id: Ic60fa2463618f86b1ae23fc4a0c06cd348f28334
 2014-11-19 11:05:43 -08:00
xinhe
046f3843f1 Merge "Add configuration to control converting sms destination number" into lmp-dev 2014-11-19 17:47:25 +00:00
Geoff Mendal
5fafd21b1f Import translations. DO NOT MERGE 
Change-Id: I97c8d622957c88f2186e7d3116726b7ba33703c7
Auto-generated-cl: translation import
 2014-11-19 07:52:29 -08:00
xinhe
67def72d05 Add configuration to control converting sms destination number 
Romove hard codes about the SimcardOperatorList and NetworkOperatorList.

Bug: 18081228
Change-Id: I0d96972c6097325634413137bfbdb5a246885276
 2014-11-18 17:09:54 -08:00
Jeff Hao
c6fdda5284 Merge "Frameworks/base: Compiled-classes support" into lmp-sprout-dev 2014-11-18 23:56:33 +00:00
Ricardo Cervera
b2a2d2c2fe am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs 
* commit 'e9fddfd802f9d00dd2d86bd78e3da3cc2f530d3c':
  docs: Add link to "Voice search in your app" video.
 2014-11-18 23:26:41 +00:00