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

129933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
fcf81f9041 am 9cd37b6c: (-s ours) am fe37951a: am 5f7dca92: am 214af0ad: am cebf9605: (-s ours) am 9b1c46df: am 3c00b28b: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '9cd37b6c2f170083d5cd029ee28533b6e381be35':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-02 22:16:01 +00:00
Deepanshu Gupta
1bb2f043fb am a4bd1ede: (-s ours) am 55249cd3: am 8e9a3715: am c4f6a8de: am 3cb97ec7: (-s ours) am 7c3a40b6: am b85d30a2: Add missing dependency in layoutlib build file [DO NOT MERGE] 
* commit 'a4bd1eded41b10bc46e78893fd5d5e21913983cf':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-05-02 22:15:57 +00:00
Deepanshu Gupta
1291d30c99 am ff100469: (-s ours) am ba384982: am 63e91b36: am e57487be: am 500a3139: (-s ours) am 7a0985ec: am f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
* commit 'ff10046913c4775f67816d1208b6fc653e4e3d72':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-02 22:15:53 +00:00
Deepanshu Gupta
1a925ba900 am 1947774f: (-s ours) am 9cb7350a: am b6de19b7: am 05d791c3: am efa617f9: (-s ours) am 15994863: am 89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '1947774fa9dd2ee883bc77d8dac09dd969a66abf':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-02 22:15:49 +00:00
Deepanshu Gupta
578a9b8dd5 am 8f1b44eb: (-s ours) am 6b6c1b01: am b971bae3: am 2800200d: am a9b296a5: (-s ours) am edd048fb: am d4f0073f: Remove references to java package class Objects. [DO NOT MERGE] 
* commit '8f1b44eb97acb257beaf3511f8f1af1972f91cce':
  Remove references to java package class Objects. [DO NOT MERGE]
 2014-05-02 22:15:43 +00:00
Michael Wright
11ad0e8bac am e8628797: am 09446329: am 52025796: Merge "Map KEY_APPSELECT to APP_SWITCH." 
* commit 'e8628797833dfab1319d7a17f9ff465de760c633':
  Map KEY_APPSELECT to APP_SWITCH.
 2014-05-02 22:15:06 +00:00
Selim Gurun
56e36a9781 Merge "Add an import missing" 2014-05-02 21:54:30 +00:00
Selim Gurun
87a0351ddc Add an import missing 
Change-Id: I99a15779bff3bae5dd78d823d1f6c7f644c98751
 2014-05-02 14:52:49 -07:00
Selim Gurun
53b75c0838 Merge "Fix javadoc breakage" 2014-05-02 21:47:46 +00:00
Selim Gurun
8b414fc483 Fix javadoc breakage 
Change-Id: I2667bdb6b4ea76c2f81bae77ceaecb3391e4521b
 2014-05-02 14:40:41 -07:00
John Reck
7f090dfa64 Merge "Allow starting an RT animation via Canvas" 2014-05-02 21:36:57 +00:00
Selim Gurun
f72382aec7 Merge "Unhide Client Cert APIS" 2014-05-02 21:34:25 +00:00
John Reck
1c058e96b3 Allow starting an RT animation via Canvas 
Change-Id: I8b105a01cf28ad03797b63347343f6b999d46386
 2014-05-02 14:31:02 -07:00
Alan Viverette
e85aef92d1 Merge "Theme colors for legacy, Holo" 2014-05-02 21:28:37 +00:00
Selim Gurun
f271c8ecd0 Unhide Client Cert APIS 
Bug:12983007
Change-Id: I9ae23be110ff036ce64271841e1ba69122ce6caa
 2014-05-02 14:19:16 -07:00
Dianne Hackborn
f589f2a190 Merge "Change wake reason checkin tag to "wr"." 2014-05-02 21:08:53 +00:00
Amith Yamasani
d23eb5ceb6 Merge "Send ACTION_MANAGED_PROFILE_REMOVED broadcast." 2014-05-02 20:58:55 +00:00
Selim Gurun
c25f243a50 Merge "Design a static API for clearclientcertpreferences" 2014-05-02 20:56:44 +00:00
Dianne Hackborn
d06dcfd3db Change wake reason checkin tag to "wr". 
The old "Wr" was also used for Wifi Running.

Also include discharge/charge time remaining in
checkin output.

Change-Id: I303a0be902002d0399b9eb76773857da9103e8ce
 2014-05-02 13:54:13 -07:00
Adam Connors
7b66ed5885 Send ACTION_MANAGED_PROFILE_REMOVED broadcast. 
When the managed profile is removed, this new intent
is used to inform the rest of the system.

Change-Id: I1748bed0a7ee0122f69d5c78235a79f8e205efec
 2014-05-02 13:54:05 -07:00
John Reck
0e82d134ee Merge "Add CanvasProperty for drawCircle" 2014-05-02 20:48:26 +00:00
John Reck
52244fff29 Add CanvasProperty for drawCircle 
Change-Id: Icbcc030f5033d2094e567d7c519b9d672f2aac1c
 2014-05-02 13:43:46 -07:00
Alan Viverette
713813f279 Theme colors for legacy, Holo 
BUG: 13677826
Change-Id: I60c38d9679c884fc8936a78732a52917db262d7d
 2014-05-02 13:31:49 -07:00
Dianne Hackborn
5d84bce122 Fix issue #14492403: Oom scores appear to be incorrect... 
...and causing runtime restarts

Got a little too aggressive with the delete key.  *blush*

Change-Id: Icd4637827424211abc2347f7f9407c2d4c95cfad
 2014-05-02 13:21:16 -07:00
Dianne Hackborn
5b8b920022 Merge "Make GET_TASKS signature|system." 2014-05-02 20:18:10 +00:00
Selim Gurun
e1c6c3ae21 Design a static API for clearclientcertpreferences 
Bug: 12983007

Change-Id: I869b4cd4c178b8fedf725f108fd2e369895543e9
 2014-05-02 13:08:55 -07:00
RoboErik
4f854e0d0b Merge "Add playback state and metadata to dump" 2014-05-02 20:07:07 +00:00
Adam Powell
9529d8f26f Merge "Fix a bug in querying showing state for action bars" 2014-05-02 20:04:01 +00:00
Jorim Jaggi
774d4a6c78 Merge "Fix padding for SIM pin entry." 2014-05-02 20:03:54 +00:00
Jorim Jaggi
9acfb48f6e Merge "Filter touch events in ExpandableView." 2014-05-02 20:03:43 +00:00
Adam Powell
c4b416f18d Fix a bug in querying showing state for action bars 
Bug 14492418

Change-Id: I8d24fd90a8d4004ace186f5ce84ba68fc8419307
 2014-05-02 12:55:24 -07:00
Deepanshu Gupta
9cd37b6c2f am fe37951a: am 5f7dca92: am 214af0ad: am cebf9605: (-s ours) am 9b1c46df: am 3c00b28b: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit 'fe37951a5979a2e54de634db3485caed29d43a73':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-02 19:47:53 +00:00
Deepanshu Gupta
a4bd1eded4 am 55249cd3: am 8e9a3715: am c4f6a8de: am 3cb97ec7: (-s ours) am 7c3a40b6: am b85d30a2: Add missing dependency in layoutlib build file [DO NOT MERGE] 
* commit '55249cd3f39927c16663911bd6c427e3422aa841':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-05-02 19:47:50 +00:00
Deepanshu Gupta
ff10046913 am ba384982: am 63e91b36: am e57487be: am 500a3139: (-s ours) am 7a0985ec: am f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
* commit 'ba38498247f7c59cd4891282f6f5e0a862179ac1':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-02 19:47:48 +00:00
Deepanshu Gupta
1947774fa9 am 9cb7350a: am b6de19b7: am 05d791c3: am efa617f9: (-s ours) am 15994863: am 89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '9cb7350a6cbf4cf2ff29c65ef0456768775229da':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-02 19:47:45 +00:00
Deepanshu Gupta
8f1b44eb97 am 6b6c1b01: am b971bae3: am 2800200d: am a9b296a5: (-s ours) am edd048fb: am d4f0073f: Remove references to java package class Objects. [DO NOT MERGE] 
* commit '6b6c1b01e0e208ec584255a99a3cfffff233155d':
  Remove references to java package class Objects. [DO NOT MERGE]
 2014-05-02 19:47:42 +00:00
Deepanshu Gupta
fe37951a59 am 5f7dca92: am 214af0ad: am cebf9605: (-s ours) am 9b1c46df: am 3c00b28b: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '5f7dca923a66665efc7e7f533083c9756fcc6c42':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-02 19:43:17 +00:00
Deepanshu Gupta
55249cd3f3 am 8e9a3715: am c4f6a8de: am 3cb97ec7: (-s ours) am 7c3a40b6: am b85d30a2: Add missing dependency in layoutlib build file [DO NOT MERGE] 
* commit '8e9a3715f50a54e13faa1940d8c829a3faf98f48':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-05-02 19:43:14 +00:00
Deepanshu Gupta
ba38498247 am 63e91b36: am e57487be: am 500a3139: (-s ours) am 7a0985ec: am f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
* commit '63e91b36c00c8d98bfa44e66ed389a42aca20bfc':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-02 19:43:11 +00:00
Deepanshu Gupta
9cb7350a6c am b6de19b7: am 05d791c3: am efa617f9: (-s ours) am 15994863: am 89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit 'b6de19b753445383689ee450a7b4a8b15971dae7':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-02 19:43:09 +00:00
Deepanshu Gupta
6b6c1b01e0 am b971bae3: am 2800200d: am a9b296a5: (-s ours) am edd048fb: am d4f0073f: Remove references to java package class Objects. [DO NOT MERGE] 
* commit 'b971bae3d1ad98cecc312c63cc3b6d432687223a':
  Remove references to java package class Objects. [DO NOT MERGE]
 2014-05-02 19:43:06 +00:00
Deepanshu Gupta
5f7dca923a am 214af0ad: am cebf9605: (-s ours) am 9b1c46df: am 3c00b28b: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '214af0ad7e90d73ce8c9fea2b4f4c6332a088d3f':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-02 19:38:43 +00:00
Deepanshu Gupta
8e9a3715f5 am c4f6a8de: am 3cb97ec7: (-s ours) am 7c3a40b6: am b85d30a2: Add missing dependency in layoutlib build file [DO NOT MERGE] 
* commit 'c4f6a8decb5f1ce3235cfcaa4c05da385fb2862e':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-05-02 19:38:40 +00:00
Deepanshu Gupta
63e91b36c0 am e57487be: am 500a3139: (-s ours) am 7a0985ec: am f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
* commit 'e57487be9ac9068710a603fc4cf584ee35bc367f':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-02 19:38:37 +00:00
Deepanshu Gupta
b6de19b753 am 05d791c3: am efa617f9: (-s ours) am 15994863: am 89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '05d791c38bd4f7412df317ed393c36910a37ae87':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-02 19:38:35 +00:00
Deepanshu Gupta
b971bae3d1 am 2800200d: am a9b296a5: (-s ours) am edd048fb: am d4f0073f: Remove references to java package class Objects. [DO NOT MERGE] 
* commit '2800200db2d293ee1f157164376eafede4b256ae':
  Remove references to java package class Objects. [DO NOT MERGE]
 2014-05-02 19:38:32 +00:00
Deepanshu Gupta
214af0ad7e am cebf9605: (-s ours) am 9b1c46df: am 3c00b28b: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit 'cebf960525539efac009c0b418b0bebf803079c5':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-02 19:34:40 +00:00
Deepanshu Gupta
c4f6a8decb am 3cb97ec7: (-s ours) am 7c3a40b6: am b85d30a2: Add missing dependency in layoutlib build file [DO NOT MERGE] 
* commit '3cb97ec7dafb48bc0ac824ced3f6b51ef4d85864':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-05-02 19:34:37 +00:00
Deepanshu Gupta
e57487be9a am 500a3139: (-s ours) am 7a0985ec: am f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
* commit '500a3139def6ac57dbf48b0dc505a9876f5c9d63':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-02 19:34:34 +00:00
Deepanshu Gupta
05d791c38b am efa617f9: (-s ours) am 15994863: am 89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit 'efa617f9fe4cbf5449d735118bf39fcfbc1dbf74':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-02 19:34:31 +00:00