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

181827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
12271e2201 Merge "Remove dead/obsolete carrier label code" 2015-02-06 21:34:01 +00:00
Alan Viverette
d525762a18 Merge "Update colored button styling" 2015-02-06 20:54:45 +00:00
Bryce Lee
a7e8717eb4 am 53b9fbd1: Expose userActivityTimeout through @SystemApi getter/setter. 
automerge: 2820911

* commit '28209111cc74e05fb6caa3d5b1756e57639247a4':
  Expose userActivityTimeout through @SystemApi getter/setter.
 2015-02-06 20:20:47 +00:00
Bryce Lee
28209111cc am 53b9fbd1: Expose userActivityTimeout through @SystemApi getter/setter. 
* commit '53b9fbd1610b6d3deb837dab34fd309d515f6385':
  Expose userActivityTimeout through @SystemApi getter/setter.
 2015-02-06 20:18:40 +00:00
Bryce Lee
53b9fbd161 Expose userActivityTimeout through @SystemApi getter/setter. 
This reverts commit 0dad5720902fad041bc8e2221953aab6dd1d2d8f.
System api documentation is not updated under PDK builds.

Change-Id: I851bcd66e0b764265e69ac104d5604bf316d5d10
 2015-02-06 12:06:34 -08:00
Jason Monk
c366060792 Remove dead/obsolete carrier label code 
Change-Id: I97563150fb4284f8e6b2b1e2aaf5fcd392b4c6cf
 2015-02-06 15:02:39 -05:00
Bryce Lee
404a1327e9 am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev 
automerge: a20e430

* commit 'a20e430d0ab8c65e392491b6d299a821c4bed50e':
  Revert "Expose userActivityTimeout through @SystemApi getter/setter."
 2015-02-06 19:45:54 +00:00
Bryce Lee
a20e430d0a am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev 
* commit '13c7044186b90f7f63e7a17996222edfb18460f5':
  Revert "Expose userActivityTimeout through @SystemApi getter/setter."
 2015-02-06 19:42:38 +00:00
Bryce Lee
13c7044186 Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev 2015-02-06 19:35:43 +00:00
Bryce Lee
0dad572090 Revert "Expose userActivityTimeout through @SystemApi getter/setter." 
This reverts commit 40a0ee65f269cffa7d3fb0646bd987a69df5c2d0.

Change-Id: Ida1a40db25643f97e82d517bcf147f23e4a3a0fe
 2015-02-06 19:35:33 +00:00
Bryce Lee
6531290d54 am 4a88acfc: Merge "Make THEATER_MODE_ON a System API." into lmp-mr1-modular-dev 
automerge: a566973

* commit 'a5669730d0910d278fbff062c700cc43ae3c9c39':
  Make THEATER_MODE_ON a System API.
 2015-02-06 19:13:03 +00:00
Bryce Lee
9cd324d158 am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev 
automerge: 7b5f9cd

* commit '7b5f9cde6ac6d949d0227eb47aa2c5de4aea71d9':
  Expose userActivityTimeout through @SystemApi getter/setter.
 2015-02-06 19:11:36 +00:00
Bryce Lee
a5669730d0 am 4a88acfc: Merge "Make THEATER_MODE_ON a System API." into lmp-mr1-modular-dev 
* commit '4a88acfcc30544fa3424020b1c071d2954a47cb2':
  Make THEATER_MODE_ON a System API.
 2015-02-06 19:09:32 +00:00
Bryce Lee
7b5f9cde6a am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev 
* commit '4cccd58e4219ff1e974db201e064c85063dd262f':
  Expose userActivityTimeout through @SystemApi getter/setter.
 2015-02-06 19:09:28 +00:00
Bryce Lee
4a88acfcc3 Merge "Make THEATER_MODE_ON a System API." into lmp-mr1-modular-dev 2015-02-06 19:05:45 +00:00
Bryce Lee
4cccd58e42 Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev 2015-02-06 19:05:22 +00:00
Scott Kennedy
a1c14fe945 Merge "Make setOn[Long]ClickListener() take a @Nullable argument" 2015-02-06 18:55:19 +00:00
Dianne Hackborn
28fbf95fc2 Merge "First quick implementation of auto assist data." 2015-02-06 18:45:05 +00:00
Dianne Hackborn
a7bb6fbeab First quick implementation of auto assist data. 
Introduce new AssistData class that contains all data
the framework automatically generates for assist.  Currently
populated with a very simple tree structure representing
the app's view hierarchy.

Reworked how we populate the class name for accessibility
info, so this is provided through a new method call on View
that subclasses can override.  This method is also used
to populate the class name in AssistData.

Change-Id: Ibd0acdc8354727d4291473283b5e4b70894905dc
 2015-02-06 10:42:44 -08:00
Alan Viverette
523ef90a7f Update colored button styling 
Change-Id: Idf31a31cb2e049a6e2dc002271c560315b441dfc
 2015-02-06 10:26:00 -08:00
Neil Fuller
0b1b82473d am 022cf57f: am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 
automerge: c63efbd

* commit 'c63efbd928cc14e32fe19b2dec41d15ffc584182':
  Avoid static initialization of Layout from TextUtils
 2015-02-06 17:52:57 +00:00
Neil Fuller
c63efbd928 am 022cf57f: am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 
* commit '022cf57f82e40a103c4a48c083a59d7fa4936668':
  Avoid static initialization of Layout from TextUtils
 2015-02-06 17:51:05 +00:00
Neil Fuller
022cf57f82 am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 
* commit 'a08934cf54e3120d5019839a4b6d553b3364e8d1':
  Avoid static initialization of Layout from TextUtils
 2015-02-06 17:44:49 +00:00
Neil Fuller
a08934cf54 am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 
* commit 'f789d45b24acc3745ccc97adb687502d488404f6':
  Avoid static initialization of Layout from TextUtils
 2015-02-06 17:37:32 +00:00
Neil Fuller
f789d45b24 Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 2015-02-06 17:30:47 +00:00
Kenny Guy
d22517a708 am b6332fd2: am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 
automerge: afca061

* commit 'afca06105c1344dade61ec5812bf605b11de0f1c':
  Fix mangled javadoc for setPermittedInputMethods.
 2015-02-06 16:44:42 +00:00
Chong Zhang
78264e1d39 am 1836f6b8: am eceae03f: am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 
automerge: c71d0cc

* commit 'c71d0ccfc7fa1d088d41b3ed43d84bb82e3e4d10':
 2015-02-06 16:43:11 +00:00
Alan Viverette
07975da378 am bbde1213: am 80b381c0: am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev 
automerge: c9dff4b

* commit 'c9dff4bd042382073c298e00a301e9c7383e35ee':
 2015-02-06 16:41:08 +00:00
Kenny Guy
afca06105c am b6332fd2: am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 
* commit 'b6332fd21a97b846015693684cee9e2af3381f0a':
  Fix mangled javadoc for setPermittedInputMethods.
 2015-02-06 16:37:11 +00:00
Chong Zhang
c71d0ccfc7 am 1836f6b8: am eceae03f: am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 
* commit '1836f6b8f3f34ad31acc04f861c380b186e52193':
 2015-02-06 16:36:50 +00:00
Alan Viverette
c9dff4bd04 am bbde1213: am 80b381c0: am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev 
* commit 'bbde12138c748fbe136db5fa9f101ccb9c52ab7b':
 2015-02-06 16:36:31 +00:00
Kenny Guy
b6332fd21a am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 
* commit '70fb0ab44e1b8d56f2cbe33d73afd3897c7584d1':
  Fix mangled javadoc for setPermittedInputMethods.
 2015-02-06 15:37:53 +00:00
Kenny Guy
70fb0ab44e am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 
* commit '8debf21357477083a716275e2a32cb7169d42c47':
  Fix mangled javadoc for setPermittedInputMethods.
 2015-02-06 15:28:21 +00:00
Kenny Guy
8debf21357 Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 2015-02-06 15:22:23 +00:00
Narayan Kamath
7869f4c9a3 Merge "Fix breakages in update-api." 2015-02-06 13:31:02 +00:00
Narayan Kamath
0d9ada9fdd Fix breakages in update-api. 
doc-comment-check was failing because a couple of javadoc comments
didn't fully qualify R.java's classname where required.

Change-Id: Id0445827e438fd4c1d6e4e9793a00a6cc9f59d3c
 2015-02-06 13:14:41 +00:00
Neil Fuller
d29bdb266d Avoid static initialization of Layout from TextUtils 
This works around a bug in standalone (e.g. non-Zygote)
runtimes when a device is attached to a host that is running
DDM.

There is a race condition:

When the runtime receives a HELLO from DDM it calls
TextUtils.isEmpty().

Calling any TextUtils methods statically initializes
Layout. Layout has dependencies on other classes, which in
turn have dependencies on native methods that are not always
registered when the call takes place. Registration and DDM
handling are done in separate threads.

This is not a fix, merely a workaround until the race can
be resolved.

Bug: 18081539
Change-Id: If1bd3de6597bc93da381c8f86dacf40156449561
 2015-02-06 10:29:54 +00:00
Elliott Hughes
b222f6c5ba am ae0bee53: am 81b84311: Merge "Fix clang build." 
automerge: cf657ad

* commit 'cf657ad46cab1c9124665e9afa6f2a89d33bba41':
  Fix clang build.
 2015-02-06 05:52:05 +00:00
Elliott Hughes
cf657ad46c am ae0bee53: am 81b84311: Merge "Fix clang build." 
* commit 'ae0bee53b84d4ffda84270852ace1841e13f5db8':
  Fix clang build.
 2015-02-06 05:50:01 +00:00
Elliott Hughes
ae0bee53b8 am 81b84311: Merge "Fix clang build." 
* commit '81b8431173837fe9ea21990948d6af30809fb056':
  Fix clang build.
 2015-02-06 05:43:15 +00:00
Elliott Hughes
81b8431173 Merge "Fix clang build." 2015-02-06 05:37:33 +00:00
Elliott Hughes
7ff53fa0d4 Fix clang build. 
Change-Id: If795820ef6431fee9c9c3862cc91ad4a9cc04507
 2015-02-05 21:36:10 -08:00
Scott Kennedy
e6ca429720 Make setOn[Long]ClickListener() take a @Nullable argument 
Change-Id: I923d1f986fa26cbf2a884c52af70469941daf8ea
 2015-02-05 21:03:42 -08:00
Chong Zhang
fb54267e71 am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev automerge: eceae03 
automerge: 3968f0c

* commit '3968f0c2dfa5cbb1432d49af47ad2fa89f1b2225':
  reset col position to 1 on row PAC
 2015-02-06 03:21:37 +00:00
Chong Zhang
3968f0c2df am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 
automerge: eceae03

* commit 'eceae03f6a21b36baddabe4ca5a2c1d9d238240a':
  reset col position to 1 on row PAC
 2015-02-06 03:17:36 +00:00
Bryce Lee
40a0ee65f2 Expose userActivityTimeout through @SystemApi getter/setter. 
This change will make it accessible to unbundled wear home.

Bug: 18721755
Change-Id: I0634dbc5d8d8ebe25e45af0a1b1186fda5254dd5
 2015-02-06 02:42:52 +00:00
Bryce Lee
e847b5baef Make THEATER_MODE_ON a System API. 
Bug: 19043538
Change-Id: Ibf0d6b45868ca90eb792a40c5d1b1395774486b8
(cherry picked from commit cdfebd60fad097fa58d45f13104990cd323be61b)
 2015-02-06 02:41:09 +00:00
Chong Zhang
1836f6b8f3 am eceae03f: am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 
* commit 'eceae03f6a21b36baddabe4ca5a2c1d9d238240a':
  reset col position to 1 on row PAC
 2015-02-06 02:26:14 +00:00
Chong Zhang
eceae03f6a am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 
* commit '6cad6513e0058467d11f4cf99519cf79eb65d48f':
  reset col position to 1 on row PAC
 2015-02-06 02:12:16 +00:00
Chong Zhang
6cad6513e0 Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 2015-02-06 02:06:24 +00:00